Changeset 97556 in vbox for trunk/src/VBox/Additions/linux

Timestamp:

Nov 15, 2022 5:29:28 PM (2 years ago)

Author:

vboxsync

Message:

Additions: Linux: vboxvideo: Introduce initial support for RHEL(8,7) kernels, bugref:10104.

Location:

trunk/src/VBox/Additions/linux/drm

Files:

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

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

@@ -84 +84 @@
 
 # if RTLNX_VER_MIN(5,14,0) || RTLNX_RHEL_RANGE(8,6, 8,99)
-#  if RTLNX_VER_MIN(5,15,0) || RTLNX_RHEL_MIN(9,1)
+#  if RTLNX_VER_MIN(5,15,0) || RTLNX_RHEL_RANGE(8,7, 8,99) || RTLNX_RHEL_MIN(9,1)
         ret = drm_aperture_remove_conflicting_pci_framebuffers(pdev, &driver);
 #  else
@@ -368 +368 @@
 
         .fops = &vbox_fops,
-#if RTLNX_VER_MAX(5,15,0) && !RTLNX_RHEL_MAJ_PREREQ(9,1)
+#if RTLNX_VER_MAX(5,15,0) && !RTLNX_RHEL_RANGE(8,7, 8,99) && !RTLNX_RHEL_MAJ_PREREQ(9,1)
         .irq_handler = vbox_irq_handler,
 #endif

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

@@ -158 +158 @@
 # include <drm/drm_ioctl.h>
 # include <drm/drm_fourcc.h>
-# if RTLNX_VER_MAX(5,15,0) && !RTLNX_RHEL_MAJ_PREREQ(9,1)
+# if RTLNX_VER_MAX(5,15,0) && !RTLNX_RHEL_RANGE(8,7, 8,99) && !RTLNX_RHEL_MAJ_PREREQ(9,1)
 #  include <drm/drm_irq.h>
 # endif

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(5,15,0) || RTLNX_RHEL_MAJ_PREREQ(9,1)
+#if RTLNX_VER_MIN(5,15,0) || RTLNX_RHEL_RANGE(8,7, 8,99) || RTLNX_RHEL_MAJ_PREREQ(9,1)
         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)
@@ -217 +217 @@
 void vbox_irq_fini(struct vbox_private *vbox)
 {
-#if RTLNX_VER_MIN(5,15,0) || RTLNX_RHEL_MAJ_PREREQ(9,1)
+#if RTLNX_VER_MIN(5,15,0) || RTLNX_RHEL_RANGE(8,7, 8,99) || RTLNX_RHEL_MAJ_PREREQ(9,1)
         free_irq(VBOX_DRM_TO_PCI_DEV(vbox->dev)->irq, vbox->dev);
 #else