Changeset 86173 in vbox for trunk/src/VBox

Timestamp:

Sep 18, 2020 3:08:06 PM (4 years ago)

Author:

vboxsync

Message:

Additions/linux: add. fixes for round 1 ticketref:19863

Location:

trunk/src/VBox/Additions/linux/drm

Files:

• vbox_drv.c (modified) (3 diffs)
• vbox_drv.h (modified) (1 diff)
• vbox_main.c (modified) (1 diff)

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

@@ -62 +62 @@
 static int vbox_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
 {
-#if RTLNX_VER_MAX(4,19,0) && RTLNX_RHEL_MAX(8,3)
+#if RTLNX_VER_MAX(4,19,0) && !RTLNX_RHEL_MAJ_PREREQ(8,3)
         return drm_get_pci_dev(pdev, ent, &driver);
 #else
@@ -304 +304 @@
 
 static struct drm_driver driver = {
-#if RTLNX_VER_MAX(5,4,0) && RTLNX_RHEL_MAX(8,3)
+#if RTLNX_VER_MAX(5,4,0) && !RTLNX_RHEL_MAJ_PREREQ(8,3)
         .driver_features =
             DRIVER_MODESET | DRIVER_GEM | DRIVER_HAVE_IRQ |
@@ -316 +316 @@
         .dev_priv_size = 0,
 
-#if RTLNX_VER_MAX(4,19,0) && RTLNX_RHEL_MAX(8,3)
+#if RTLNX_VER_MAX(4,19,0) && !RTLNX_RHEL_MAJ_PREREQ(8,3)
     /* Legacy hooks, but still supported. */
         .load = vbox_driver_load,

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

@@ -152 +152 @@
 #endif
 
-#if RTLNX_VER_MAX(5,5,0) && RTLNX_RHEL_MAX(8,3)
+#if RTLNX_VER_MAX(5,5,0) && !RTLNX_RHEL_MAJ_PREREQ(8,3)
 # include <drm/drmP.h>
 #else /* >= 5.5.0 || RHEL >= 8.3 */

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

@@ -448 +448 @@
 }
 
-#if RTLNX_VER_MAX(4,19,0) && RTLNX_RHEL_MAX(8,3)
+#if RTLNX_VER_MAX(4,19,0) && !RTLNX_RHEL_MAJ_PREREQ(8,3)
 int vbox_driver_load(struct drm_device *dev, unsigned long flags)
 #else