Changeset 98034 in vbox

Timestamp:

Jan 9, 2023 6:41:48 PM (23 months ago)

Author:

vboxsync

Message:

Additions: Linux: vboxvideo: Introduce initial support for kernel 6.2, bugref:10345.

Location:

trunk/src/VBox/Additions/linux/drm

Files:

• vbox_drv.h (modified) (1 diff)
• vbox_fb.c (modified) (5 diffs)
• vbox_mode.c (modified) (1 diff)

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

@@ -241 +241 @@
 #else
 # define VBOX_DRM_TO_PCI_DEV(_dev) _dev->pdev
+#endif
+
+/** Field "num_pages" of struct ttm_resource was renamed to "size" in 6.2 and
+ * now represents number of bytes. This macro handles this change. Input
+ * argument is a pointer to struct ttm_resource. */
+#if RTLNX_VER_MIN(6,2,0)
+# define VBOX_BO_RESOURCE_NUM_PAGES(_resource) PFN_UP(_resource->size)
+#else
+# define VBOX_BO_RESOURCE_NUM_PAGES(_resource) _resource->num_pages
 #endif
 

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

@@ -51 +51 @@
 #include <VBoxVideo.h>
 
+#if RTLNX_VER_MIN(6,2,0)
+# define VBOX_FBDEV_INFO(_helper) _helper.info
+#else
+# define VBOX_FBDEV_INFO(_helper) _helper.fbdev
+#endif
+
 #if RTLNX_VER_MAX(4,7,0) && !RTLNX_RHEL_MAJ_PREREQ(7,4)
 /**
@@ -303 +309 @@
 
 #if RTLNX_VER_MIN(5,14,0) || RTLNX_RHEL_RANGE(8,6, 8,99)
-        ret = ttm_bo_kmap(&bo->bo, 0, bo->bo.resource->num_pages, &bo->kmap);
+        ret = ttm_bo_kmap(&bo->bo, 0, VBOX_BO_RESOURCE_NUM_PAGES(bo->bo.resource), &bo->kmap);
 #elif RTLNX_VER_MIN(5,12,0) || RTLNX_RHEL_MAJ_PREREQ(8,5)
         ret = ttm_bo_kmap(&bo->bo, 0, bo->bo.mem.num_pages, &bo->kmap);
@@ -316 +322 @@
         }
 
+#if RTLNX_VER_MIN(6,2,0)
+        info = drm_fb_helper_alloc_info(helper);
+#else
         info = drm_fb_helper_alloc_fbi(helper);
+#endif
         if (IS_ERR(info))
                 return -PTR_ERR(info);
@@ -396 +406 @@
 
 #ifdef CONFIG_FB_DEFERRED_IO
-        if (fbdev->helper.fbdev && fbdev->helper.fbdev->fbdefio)
-                fb_deferred_io_cleanup(fbdev->helper.fbdev);
-#endif
-
+        if (VBOX_FBDEV_INFO(fbdev->helper) && VBOX_FBDEV_INFO(fbdev->helper)->fbdefio)
+                fb_deferred_io_cleanup(VBOX_FBDEV_INFO(fbdev->helper));
+#endif
+
+#if RTLNX_VER_MIN(6,2,0)
+        drm_fb_helper_unregister_info(&fbdev->helper);
+#else
         drm_fb_helper_unregister_fbi(&fbdev->helper);
+#endif
 
         if (afb->obj) {
@@ -483 +497 @@
 void vbox_fbdev_set_base(struct vbox_private *vbox, unsigned long gpu_addr)
 {
-        struct fb_info *fbdev = vbox->fbdev->helper.fbdev;
+        struct fb_info *fbdev = VBOX_FBDEV_INFO(vbox->fbdev->helper);
 
         fbdev->fix.smem_start = fbdev->apertures->ranges[0].base + gpu_addr;

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

@@ -866 +866 @@
 
 #if RTLNX_VER_MIN(5,14,0) || RTLNX_RHEL_RANGE(8,6, 8,99)
-        ret = ttm_bo_kmap(&bo->bo, 0, bo->bo.resource->num_pages, &uobj_map);
+        ret = ttm_bo_kmap(&bo->bo, 0, VBOX_BO_RESOURCE_NUM_PAGES(bo->bo.resource), &uobj_map);
 #elif RTLNX_VER_MIN(5,12,0) || RTLNX_RHEL_MAJ_PREREQ(8,5)
         ret = ttm_bo_kmap(&bo->bo, 0, bo->bo.mem.num_pages, &uobj_map);