Changeset 101079 in vbox for trunk/src/VBox/Additions

Timestamp:

Sep 11, 2023 2:04:13 PM (17 months ago)

Author:

vboxsync

Message:

Additions: Linux: vboxvideo: Introduce initial support for kernel 6.6, bugref:10524.

Location:

trunk/src/VBox/Additions/linux/drm

Files:

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

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)
         .prime_handle_to_fd = drm_gem_prime_handle_to_fd,
         .prime_fd_to_handle = drm_gem_prime_fd_to_handle,
-
+#endif
         .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)
         .gem_prime_mmap = vbox_gem_prime_mmap,
+#endif
 
 #if RTLNX_VER_MAX(5,11,0) && !RTLNX_RHEL_MAJ_PREREQ(8,5)

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)
 int vbox_gem_prime_mmap(struct drm_gem_object *obj,
                         struct vm_area_struct *area);
+#endif
 
 /* vbox_irq.c */

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

@@ -198 +198 @@
         .fb_set_par = drm_fb_helper_set_par,
 #if RTLNX_VER_MIN(6,5,0)
-        FB_DEFAULT_SYS_OPS,
+        .fb_read    = fb_sys_read,
+        .fb_write   = fb_sys_write,
+        .fb_fillrect = sys_fillrect,
+        .fb_copyarea = sys_copyarea,
+        .fb_imageblit = sys_imageblit,
+        .fb_mmap = NULL,
 #else
         .fb_fillrect = drm_fb_helper_sys_fillrect,
@@ -347 +352 @@
          * does not think it is needed.
          */
+#if RTLNX_VER_MIN(6,6,0)
+        info->flags = FBINFO_MISC_ALWAYS_SETPAR;
+#else
         info->flags = FBINFO_DEFAULT | FBINFO_MISC_ALWAYS_SETPAR;
+#endif
         info->fbops = &vboxfb_ops;
 

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

@@ -74 +74 @@
 }
 
+#if RTLNX_VER_MAX(6,6,0)
 int vbox_gem_prime_mmap(struct drm_gem_object *obj, struct vm_area_struct *area)
 {
@@ -79 +80 @@
         return -ENOSYS;
 }
+#endif