Changeset 98868 in vbox for trunk/src/VBox/Additions/linux/drm

Timestamp:

Mar 7, 2023 5:22:14 PM (2 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

156194

Message:

Additions: Linux: vboxvideo: Introduce initial support for kernel 6.3.x series, bugref:10381.

Location:

trunk/src/VBox/Additions/linux/drm

Files:

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

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

@@ -173 +173 @@
 #endif
 
-#include <drm/ttm/ttm_bo_api.h>
-#include <drm/ttm/ttm_bo_driver.h>
+#if RTLNX_VER_MIN(6,3,0)
+# include <drm/ttm/ttm_bo.h>
+#else
+# include <drm/ttm/ttm_bo_api.h>
+# include <drm/ttm/ttm_bo_driver.h>
+#endif
 #include <drm/ttm/ttm_placement.h>
 #if RTLNX_VER_MAX(5,13,0) && !RTLNX_RHEL_RANGE(8,6, 8,99)

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

@@ -346 +346 @@
         info->fbops = &vboxfb_ops;
 
+#if RTLNX_VER_MAX(6,3,0)
         /*
          * This seems to be done for safety checking that the framebuffer
@@ -352 +353 @@
         info->apertures->ranges[0].base = pci_resource_start(VBOX_DRM_TO_PCI_DEV(dev), 0);
         info->apertures->ranges[0].size = pci_resource_len(VBOX_DRM_TO_PCI_DEV(dev), 0);
+#endif
 
 #if RTLNX_VER_MIN(5,2,0) || RTLNX_RHEL_MAJ_PREREQ(8,2)
@@ -458 +460 @@
         spin_lock_init(&fbdev->dirty_lock);
 
-#if RTLNX_VER_MAX(3,17,0) && !RTLNX_RHEL_MAJ_PREREQ(7,2)
+#if RTLNX_VER_MIN(6,3,0)
+        drm_fb_helper_prepare(dev, &fbdev->helper, 32, &vbox_fb_helper_funcs);
+#elif RTLNX_VER_MIN(3,17,0) || RTLNX_RHEL_MIN(7,2)
+        drm_fb_helper_prepare(dev, &fbdev->helper, &vbox_fb_helper_funcs);
+#else
         fbdev->helper.funcs = &vbox_fb_helper_funcs;
-#else
-        drm_fb_helper_prepare(dev, &fbdev->helper, &vbox_fb_helper_funcs);
-#endif
+#endif
+
 #if RTLNX_VER_MIN(5,7,0) || RTLNX_RHEL_MIN(8,4) || RTLNX_SUSE_MAJ_PREREQ(15,3)
         ret = drm_fb_helper_init(dev, &fbdev->helper);
@@ -484 +489 @@
         drm_helper_disable_unused_functions(dev);
 
+#if RTLNX_VER_MIN(6,3,0)
+        ret = drm_fb_helper_initial_config(&fbdev->helper);
+#else
         ret = drm_fb_helper_initial_config(&fbdev->helper, 32);
+#endif
         if (ret)
                 goto err_fini;
@@ -499 +508 @@
         struct fb_info *fbdev = VBOX_FBDEV_INFO(vbox->fbdev->helper);
 
+#if RTLNX_VER_MIN(6,3,0)
+    fbdev->fix.smem_start = 
+pci_resource_start(VBOX_DRM_TO_PCI_DEV(vbox->fbdev->helper.dev), 0) + gpu_addr;
+#else
         fbdev->fix.smem_start = fbdev->apertures->ranges[0].base + gpu_addr;
+#endif
         fbdev->fix.smem_len = vbox->available_vram_size - gpu_addr;
 }

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

@@ -37 +37 @@
 #include <drm/drm_crtc_helper.h>
 
+#if RTLNX_VER_MIN(6,3,0)
+# include <drm/drm_modeset_helper.h>
+#endif
+
 #include <VBoxVideoGuest.h>
 #include <VBoxVideoVBE.h>

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

@@ -40 +40 @@
 #include <linux/export.h>
 #include <drm/drm_crtc_helper.h>
+#if RTLNX_VER_MIN(6,3,0)
+# include <drm/drm_modeset_helper_vtables.h>
+# include <drm/drm_modeset_helper.h>
+#endif
 #if RTLNX_VER_MIN(3,18,0) || RTLNX_RHEL_MAJ_PREREQ(7,2)
 # include <drm/drm_plane_helper.h>

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

@@ -34 +34 @@
  */
 #include "vbox_drv.h"
+
+#if RTLNX_VER_MIN(6,3,0)
+# include <drm/ttm/ttm_tt.h>
+#endif
+
 #if RTLNX_VER_MIN(5,11,0) || RTLNX_RHEL_MAJ_PREREQ(8,5)
 # include <drm/drm_gem.h>