Репозиторий Sisyphus
Последнее обновление: 1 октября 2023 | Пакетов: 18631 | Посещений: 37498573
en ru br
Репозитории ALT
S:1.14.1-alt1.394501.1
www.altlinux.org/Changes

Группа :: Система/Ядро и оборудование
Пакет: kernel-modules-evdi-un-def

 Главная   Изменения   Спек   Патчи   Sources   Загрузить   Gear   Bugs and FR  Repocop 

Патч: evdi-1.12.0-centos9.patch
Скачать

diff -uNpar kernel-source-evdi-1.12.0.orig/evdi_drm_drv.c kernel-source-evdi-1.12.0/evdi_drm_drv.c
--- kernel-source-evdi-1.12.0.orig/evdi_drm_drv.c	2022-08-11 10:39:09.000000000 +0200
+++ kernel-source-evdi-1.12.0/evdi_drm_drv.c	2022-12-08 13:32:22.978256330 +0100
@@ -12,7 +12,7 @@
  */
 
 #include <linux/version.h>
-#if KERNEL_VERSION(5, 16, 0) <= LINUX_VERSION_CODE
+#if KERNEL_VERSION(5, 16, 0) <= LINUX_VERSION_CODE || (RHEL_RELEASE_VERSION(9, 0) <= RHEL_RELEASE_CODE)
 #include <drm/drm_ioctl.h>
 #include <drm/drm_file.h>
 #include <drm/drm_drv.h>
diff -uNpar kernel-source-evdi-1.12.0.orig/evdi_drm_drv.h kernel-source-evdi-1.12.0/evdi_drm_drv.h
--- kernel-source-evdi-1.12.0.orig/evdi_drm_drv.h	2022-08-11 10:39:09.000000000 +0200
+++ kernel-source-evdi-1.12.0/evdi_drm_drv.h	2022-12-08 13:36:34.132007261 +0100
@@ -25,8 +25,8 @@
 #else
 #include <drm/drmP.h>
 #endif
-#if KERNEL_VERSION(5, 15, 0) <= LINUX_VERSION_CODE
-#include <drm/drm_legacy.h>
+#if KERNEL_VERSION(5, 15, 0) <= LINUX_VERSION_CODE || (RHEL_RELEASE_VERSION(9, 0) <= RHEL_RELEASE_CODE)
+#include <drm/drm_framebuffer.h>
 #else
 #include <drm/drm_irq.h>
 #endif
diff -uNpar kernel-source-evdi-1.12.0.orig/evdi_gem.c kernel-source-evdi-1.12.0/evdi_gem.c
--- kernel-source-evdi-1.12.0.orig/evdi_gem.c	2022-08-11 10:39:09.000000000 +0200
+++ kernel-source-evdi-1.12.0/evdi_gem.c	2022-12-08 13:32:22.978256330 +0100
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0-only
+// spDX-License-Identifier: GPL-2.0-only
 /*
  * Copyright (C) 2012 Red Hat
  * Copyright (c) 2015 - 2020 DisplayLink (UK) Ltd.
@@ -10,11 +10,11 @@
 
 #include <linux/sched.h>
 #include <linux/version.h>
-#if KERNEL_VERSION(5, 18, 0) <= LINUX_VERSION_CODE
+#if KERNEL_VERSION(5, 18, 0) <= LINUX_VERSION_CODE || (RHEL_RELEASE_VERSION(9, 0) <= RHEL_RELEASE_CODE)
 #elif KERNEL_VERSION(5, 11, 0) <= LINUX_VERSION_CODE
 #include <linux/dma-buf-map.h>
 #endif
-#if KERNEL_VERSION(5, 16, 0) <= LINUX_VERSION_CODE
+#if KERNEL_VERSION(5, 16, 0) <= LINUX_VERSION_CODE || (RHEL_RELEASE_VERSION(9, 0) <= RHEL_RELEASE_CODE)
 #include <drm/drm_prime.h>
 #include <drm/drm_file.h>
 #elif KERNEL_VERSION(5, 5, 0) <= LINUX_VERSION_CODE || defined(EL8)
@@ -27,7 +27,7 @@
 #include <linux/dma-buf.h>
 #include <drm/drm_cache.h>
 
-#if KERNEL_VERSION(5, 16, 0) <= LINUX_VERSION_CODE
+#if KERNEL_VERSION(5, 16, 0) <= LINUX_VERSION_CODE || (RHEL_RELEASE_VERSION(9, 0) <= RHEL_RELEASE_CODE)
 MODULE_IMPORT_NS(DMA_BUF);
 #endif
 
@@ -291,7 +291,7 @@ int evdi_gem_vmap(struct evdi_gem_object
 	int ret;
 
 	if (evdi_drm_gem_object_use_import_attach(&obj->base)) {
-#if KERNEL_VERSION(5, 18, 0) <= LINUX_VERSION_CODE
+#if KERNEL_VERSION(5, 18, 0) <= LINUX_VERSION_CODE || (RHEL_RELEASE_VERSION(9, 0) <= RHEL_RELEASE_CODE)
 		struct iosys_map map = IOSYS_MAP_INIT_VADDR(NULL);
 #elif KERNEL_VERSION(5, 11, 0) <= LINUX_VERSION_CODE || defined(EL8)
 		struct dma_buf_map map = DMA_BUF_MAP_INIT_VADDR(NULL);
@@ -324,7 +324,7 @@ int evdi_gem_vmap(struct evdi_gem_object
 void evdi_gem_vunmap(struct evdi_gem_object *obj)
 {
 	if (evdi_drm_gem_object_use_import_attach(&obj->base)) {
-#if KERNEL_VERSION(5, 18, 0) <= LINUX_VERSION_CODE
+#if KERNEL_VERSION(5, 18, 0) <= LINUX_VERSION_CODE || (RHEL_RELEASE_VERSION(9, 0) <= RHEL_RELEASE_CODE)
 		struct iosys_map map = IOSYS_MAP_INIT_VADDR(NULL);
 
 		if (obj->vmap_is_iomem)
diff -uNpar kernel-source-evdi-1.12.0.orig/evdi_ioc32.c kernel-source-evdi-1.12.0/evdi_ioc32.c
--- kernel-source-evdi-1.12.0.orig/evdi_ioc32.c	2022-08-11 10:39:09.000000000 +0200
+++ kernel-source-evdi-1.12.0/evdi_ioc32.c	2022-12-08 13:32:22.978256330 +0100
@@ -22,7 +22,7 @@
 #include <linux/compat.h>
 
 #include <linux/version.h>
-#if KERNEL_VERSION(5, 16, 0) <= LINUX_VERSION_CODE
+#if KERNEL_VERSION(5, 16, 0) <= LINUX_VERSION_CODE || (RHEL_RELEASE_VERSION(9, 0) <= RHEL_RELEASE_CODE)
 #include <drm/drm_ioctl.h>
 #elif KERNEL_VERSION(5, 5, 0) <= LINUX_VERSION_CODE || defined(EL8)
 #else
@@ -62,12 +62,12 @@ static int compat_evdi_connect(struct fi
 	if (copy_from_user(&req32, (void __user *)arg, sizeof(req32)))
 		return -EFAULT;
 
-#if KERNEL_VERSION(5, 0, 0) <= LINUX_VERSION_CODE && KERNEL_VERSION(5, 14, 0) >= LINUX_VERSION_CODE || defined(EL8)
+#if KERNEL_VERSION(5, 0, 0) <= LINUX_VERSION_CODE && KERNEL_VERSION(5, 14, 0) >= LINUX_VERSION_CODE && (RHEL_RELEASE_VERSION(9, 0) > RHEL_RELEASE_CODE)
 	request = compat_alloc_user_space(sizeof(*request));
 #else
 	request = kmalloc(sizeof(*request), GFP_USER);
 #endif
-#if KERNEL_VERSION(5, 0, 0) <= LINUX_VERSION_CODE || defined(EL8)
+#if KERNEL_VERSION(5, 0, 0) <= LINUX_VERSION_CODE || defined(EL8) 
 	if (!access_ok(request, sizeof(*request))
 #else
 	if (!access_ok(VERIFY_WRITE, request, sizeof(*request))
@@ -95,7 +95,7 @@ static int compat_evdi_grabpix(struct fi
 	if (copy_from_user(&req32, (void __user *)arg, sizeof(req32)))
 		return -EFAULT;
 
-#if KERNEL_VERSION(5, 0, 0) <= LINUX_VERSION_CODE && KERNEL_VERSION(5, 14, 0) >= LINUX_VERSION_CODE || defined(EL8)
+#if KERNEL_VERSION(5, 0, 0) <= LINUX_VERSION_CODE && KERNEL_VERSION(5, 14, 0) >= LINUX_VERSION_CODE && (RHEL_RELEASE_VERSION(9, 0) > RHEL_RELEASE_CODE)
 	request = compat_alloc_user_space(sizeof(*request));
 #else
 	request = kmalloc(sizeof(*request), GFP_USER);
diff -uNpar kernel-source-evdi-1.12.0.orig/evdi_modeset.c kernel-source-evdi-1.12.0/evdi_modeset.c
--- kernel-source-evdi-1.12.0.orig/evdi_modeset.c	2022-08-11 10:39:09.000000000 +0200
+++ kernel-source-evdi-1.12.0/evdi_modeset.c	2022-12-08 13:32:22.978256330 +0100
@@ -12,7 +12,7 @@
  */
 
 #include <linux/version.h>
-#if KERNEL_VERSION(5, 16, 0) <= LINUX_VERSION_CODE
+#if KERNEL_VERSION(5, 16, 0) <= LINUX_VERSION_CODE || (RHEL_RELEASE_VERSION(9, 0) <= RHEL_RELEASE_CODE)
 #include <drm/drm_vblank.h>
 #include <drm/drm_damage_helper.h>
 #elif KERNEL_VERSION(5, 0, 0) <= LINUX_VERSION_CODE || defined(EL8)
diff -uNpar kernel-source-evdi-1.12.0.orig/evdi_painter.c kernel-source-evdi-1.12.0/evdi_painter.c
--- kernel-source-evdi-1.12.0.orig/evdi_painter.c	2022-08-11 10:39:09.000000000 +0200
+++ kernel-source-evdi-1.12.0/evdi_painter.c	2022-12-08 13:32:22.978256330 +0100
@@ -10,7 +10,7 @@
 #include "linux/thread_info.h"
 #include "linux/mm.h"
 #include <linux/version.h>
-#if KERNEL_VERSION(5, 16, 0) <= LINUX_VERSION_CODE
+#if KERNEL_VERSION(5, 16, 0) <= LINUX_VERSION_CODE || (RHEL_RELEASE_VERSION(9, 0) <= RHEL_RELEASE_CODE)
 #include <drm/drm_file.h>
 #include <drm/drm_vblank.h>
 #include <drm/drm_ioctl.h>
@@ -31,7 +31,7 @@
 
 #include <linux/dma-buf.h>
 
-#if KERNEL_VERSION(5, 16, 0) <= LINUX_VERSION_CODE
+#if KERNEL_VERSION(5, 16, 0) <= LINUX_VERSION_CODE || (RHEL_RELEASE_VERSION(9, 0) <= RHEL_RELEASE_CODE)
 MODULE_IMPORT_NS(DMA_BUF);
 #endif
 
дизайн и разработка: Vladimir Lettiev aka crux © 2004-2005, Andrew Avramenko aka liks © 2007-2008
текущий майнтейнер: Michael Shigorin