Changeset 102794 in vbox for trunk

Timestamp:

Jan 9, 2024 1:00:46 PM (13 months ago)

Author:

vboxsync

Message:

Additions: Linux: vboxvideo: Additional fixes for RHEL 9.4 kernel, bugref:10482, bugref:10524.

Location:

trunk/src/VBox/Additions/linux/drm

Files:

• vbox_drv.c (modified) (2 diffs)
• vbox_drv.h (modified) (1 diff)
• vbox_fb.c (modified) (1 diff)
• vbox_prime.c (modified) (1 diff)

trunk/src/VBox/Additions/linux/drm/vbox_drv.c

@@ -388 +388 @@
         .dumb_destroy = drm_gem_dumb_destroy,
 #endif
-#if RTLNX_VER_MAX(6,6,0)
+#if RTLNX_VER_MAX(6,6,0) && !RTLNX_RHEL_MAJ_PREREQ(9,4)
         .prime_handle_to_fd = drm_gem_prime_handle_to_fd,
         .prime_fd_to_handle = drm_gem_prime_fd_to_handle,
@@ -394 +394 @@
         .gem_prime_import = drm_gem_prime_import,
         .gem_prime_import_sg_table = vbox_gem_prime_import_sg_table,
-#if RTLNX_VER_MAX(6,6,0)
+#if RTLNX_VER_MAX(6,6,0) && !RTLNX_RHEL_MAJ_PREREQ(9,4)
         .gem_prime_mmap = vbox_gem_prime_mmap,
 #endif

trunk/src/VBox/Additions/linux/drm/vbox_drv.h

@@ -530 +530 @@
 void *vbox_gem_prime_vmap(struct drm_gem_object *obj);
 void vbox_gem_prime_vunmap(struct drm_gem_object *obj, void *vaddr);
-#if RTLNX_VER_MAX(6,6,0)
+#if RTLNX_VER_MAX(6,6,0) && !RTLNX_RHEL_MAJ_PREREQ(9,4)
 int vbox_gem_prime_mmap(struct drm_gem_object *obj,
                         struct vm_area_struct *area);

trunk/src/VBox/Additions/linux/drm/vbox_fb.c

@@ -197 +197 @@
         .fb_check_var = drm_fb_helper_check_var,
         .fb_set_par = drm_fb_helper_set_par,
-#if RTLNX_VER_MIN(6,5,0)
+#if RTLNX_VER_MIN(6,5,0) || RTLNX_RHEL_MAJ_PREREQ(9,4)
         .fb_read    = fb_sys_read,
         .fb_write   = fb_sys_write,

trunk/src/VBox/Additions/linux/drm/vbox_prime.c

@@ -74 +74 @@
 }
 
-#if RTLNX_VER_MAX(6,6,0)
+#if RTLNX_VER_MAX(6,6,0) && !RTLNX_RHEL_MAJ_PREREQ(9,4)
 int vbox_gem_prime_mmap(struct drm_gem_object *obj, struct vm_area_struct *area)
 {