Changeset 88274 in vbox

Timestamp:

Mar 24, 2021 12:49:44 PM (4 years ago)

Author:

vboxsync

Message:

GAs: Linux: make vboxvideo work w/ 5.12-rc4 kernel, bugref:9976.

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_mode.c (modified) (1 diff)
• vbox_ttm.c (modified) (1 diff)

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

@@ -318 +318 @@
             DRIVER_PRIME,
 #else  /* >= 5.4.0 && RHEL >= 8.3 */
-        .driver_features = DRIVER_MODESET | DRIVER_GEM | DRIVER_HAVE_IRQ,
+                .driver_features = DRIVER_MODESET | DRIVER_GEM | DRIVER_HAVE_IRQ,
 #endif /* <  5.4.0 */
 
 #if RTLNX_VER_MAX(4,19,0) && !RTLNX_RHEL_MAJ_PREREQ(8,3)
-    /* Legacy hooks, but still supported. */
+        /* Legacy hooks, but still supported. */
         .load = vbox_driver_load,
         .unload = vbox_driver_unload,
@@ -351 +351 @@
 #if RTLNX_VER_MAX(3,12,0) && !RTLNX_RHEL_MAJ_PREREQ(7,3)
         .dumb_destroy = vbox_dumb_destroy,
-#else
+#elif RTLNX_VER_MAX(5,12,0)
         .dumb_destroy = drm_gem_dumb_destroy,
 #endif

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

@@ -175 +175 @@
 #include <drm/ttm/ttm_placement.h>
 #include <drm/ttm/ttm_memory.h>
-#include <drm/ttm/ttm_module.h>
+#if RTLNX_VER_MAX(5,12,0)
+# include <drm/ttm/ttm_module.h>
+#endif
 #if RTLNX_VER_MIN(5,10,0)
 # include <drm/ttm/ttm_resource.h>

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

@@ -302 +302 @@
         }
 
+#if RTLNX_VER_MIN(5,12,0)
+        ret = ttm_bo_kmap(&bo->bo, 0, bo->bo.mem.num_pages, &bo->kmap);
+#else
         ret = ttm_bo_kmap(&bo->bo, 0, bo->bo.num_pages, &bo->kmap);
+#endif
+
         vbox_bo_unreserve(bo);
         if (ret) {

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

@@ -857 +857 @@
         dst = vbox->cursor_data;
 
+#if RTLNX_VER_MIN(5,12,0)
+        ret = ttm_bo_kmap(&bo->bo, 0, bo->bo.mem.num_pages, &uobj_map);
+#else
         ret = ttm_bo_kmap(&bo->bo, 0, bo->bo.num_pages, &uobj_map);
+#endif
         if (ret) {
                 vbox->cursor_data_size = 0;

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

@@ -212 +212 @@
         mem->bus.addr = NULL;
         mem->bus.offset = 0;
+# if RTLNX_VER_MAX(5,12,0)
         mem->size = mem->num_pages << PAGE_SHIFT;
+# endif
         mem->start = 0;
         mem->bus.is_iomem = false;