Changeset 91233 in vbox

Timestamp:

Sep 14, 2021 12:14:49 PM (3 years ago)

Author:

vboxsync

Message:

Additions: Linux: vboxvideo: introduce initial support for kernel 5.15, bugref:10104.

Location:

trunk/src/VBox/Additions/linux/drm

Files:

• vbox_drv.c (modified) (3 diffs)
• vbox_drv.h (modified) (2 diffs)
• vbox_irq.c (modified) (2 diffs)

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

@@ -71 +71 @@
 
 # if RTLNX_VER_MIN(5,14,0)
+#  if RTLNX_VER_MIN(5,15,0)
+        ret = drm_aperture_remove_conflicting_pci_framebuffers(pdev, &driver);
+#  else
         ret = drm_aperture_remove_conflicting_pci_framebuffers(pdev, "vboxvideofb");
+#  endif
         if (ret)
         {
@@ -77 +81 @@
                 return ret;
         }
-# endif /* 5.14 */
+# endif /* >= 5.14. */
 
         dev = drm_dev_alloc(&driver, &pdev->dev);
@@ -351 +355 @@
 
         .fops = &vbox_fops,
+#if RTLNX_VER_MAX(5,15,0)
         .irq_handler = vbox_irq_handler,
+#endif
         .name = DRIVER_NAME,
         .desc = DRIVER_DESC,

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

@@ -158 +158 @@
 # include <drm/drm_ioctl.h>
 # include <drm/drm_fourcc.h>
-# include <drm/drm_irq.h>
+# if RTLNX_VER_MAX(5,15,0)
+#  include <drm/drm_irq.h>
+# endif
 # include <drm/drm_vblank.h>
 #else /* < 5.5.0 || RHEL < 8.3 || SLES < 15-SP3 */
@@ -518 +520 @@
 void vbox_irq_fini(struct vbox_private *vbox);
 void vbox_report_hotplug(struct vbox_private *vbox);
+#if RTLNX_VER_MAX(5,15,0)
 irqreturn_t vbox_irq_handler(int irq, void *arg);
+#endif
 
 /* vbox_hgsmi.c */

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

@@ -206 +206 @@
         INIT_WORK(&vbox->hotplug_work, vbox_hotplug_worker);
         vbox_update_mode_hints(vbox);
-#if RTLNX_VER_MIN(3,16,0) || RTLNX_RHEL_MAJ_PREREQ(7,1)
+#if RTLNX_VER_MIN(5,15,0)
+        return request_irq(VBOX_DRM_TO_PCI_DEV(vbox->dev)->irq, vbox_irq_handler, IRQF_SHARED, vbox->dev->driver->name, vbox->dev);
+#elif RTLNX_VER_MIN(3,16,0) || RTLNX_RHEL_MAJ_PREREQ(7,1)
         return drm_irq_install(vbox->dev, VBOX_DRM_TO_PCI_DEV(vbox->dev)->irq);
 #else
@@ -215 +217 @@
 void vbox_irq_fini(struct vbox_private *vbox)
 {
+#if RTLNX_VER_MIN(5,15,0)
+        free_irq(VBOX_DRM_TO_PCI_DEV(vbox->dev)->irq, vbox->dev);
+#else
         drm_irq_uninstall(vbox->dev);
+#endif
         flush_work(&vbox->hotplug_work);
 }