Changeset 86196 in vbox for trunk/src/VBox

Timestamp:

Sep 21, 2020 1:17:37 PM (4 years ago)

Author:

vboxsync

Message:

Additions/linux:Guest additions 6.1.14 won't build in RHEL 8.3 beta ticketref:19863 round 2

Location:

trunk/src/VBox/Additions/linux/drm

Files:

• vbox_drv.c (modified) (3 diffs)
• vbox_drv.h (modified) (3 diffs)
• vbox_main.c (modified) (2 diffs)
• vbox_mode.c (modified) (3 diffs)
• vbox_ttm.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)
-        return drm_get_pci_dev(pdev, ent, &driver);
-#else
+#if RTLNX_VER_MIN(4,19,0) || RTLNX_RHEL_MIN(8,3)
         struct drm_device *dev = NULL;
         int ret = 0;
@@ -91 +89 @@
 err_drv_alloc:
         return ret;
+#else /* < 4.19.0 || RHEL < 8.3 */
+        return drm_get_pci_dev(pdev, ent, &driver);
 #endif
 }
@@ -304 +304 @@
 
 static struct drm_driver driver = {
-#if RTLNX_VER_MAX(5,4,0)
-        .driver_features =
-            DRIVER_MODESET | DRIVER_GEM | DRIVER_HAVE_IRQ |
+#if RTLNX_VER_MAX(5,4,0) && !RTLNX_RHEL_MAJ_PREREQ(8,3)
+        .driver_features = DRIVER_MODESET | DRIVER_GEM | DRIVER_HAVE_IRQ |
 # if RTLNX_VER_MAX(5,1,0) && !RTLNX_RHEL_MAJ_PREREQ(8,1)
             DRIVER_IRQ_SHARED |
 # endif
             DRIVER_PRIME,
-#else  /* >= 5.4.0 */
+#else  /* >= 5.4.0 && RHEL >= 8.3 */
         .driver_features = DRIVER_MODESET | DRIVER_GEM | DRIVER_HAVE_IRQ,
 #endif /* <  5.4.0 */
         .dev_priv_size = 0,
 
-#if RTLNX_VER_MAX(4,19,0)
+#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)
-# include <drm/drmP.h>
-#else /* >= 5.5.0 */
+#if RTLNX_VER_MIN(5,5,0) || RTLNX_RHEL_MIN(8,3)
 # include <drm/drm_file.h>
 # include <drm/drm_drv.h>
@@ -162 +160 @@
 # include <drm/drm_irq.h>
 # include <drm/drm_vblank.h>
-#endif /* >= 5.5.0 */
+#else /* < 5.5.0 || RHEL < 8.3 */
+# include <drm/drmP.h>
+#endif
 #if RTLNX_VER_MIN(4,11,0) || RTLNX_RHEL_MAJ_PREREQ(7,5)
 # include <drm/drm_encoder.h>
@@ -299 +299 @@
 #undef CURSOR_DATA_SIZE
 
-#if RTLNX_VER_MAX(4,19,0)
+#if RTLNX_VER_MIN(4,19,0) || RTLNX_RHEL_MIN(8,3)
+int vbox_driver_load(struct drm_device *dev);
+#else
 int vbox_driver_load(struct drm_device *dev, unsigned long flags);
-#else
-int vbox_driver_load(struct drm_device *dev);
 #endif
 #if RTLNX_VER_MIN(4,11,0) || RTLNX_RHEL_MAJ_PREREQ(7,5)

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

@@ -448 +448 @@
 }
 
-#if RTLNX_VER_MAX(4,19,0)
+#if RTLNX_VER_MIN(4,19,0) || RTLNX_RHEL_MIN(8,3)
+int vbox_driver_load(struct drm_device *dev)
+#else
 int vbox_driver_load(struct drm_device *dev, unsigned long flags)
-#else
-int vbox_driver_load(struct drm_device *dev)
 #endif
 {
@@ -622 +622 @@
 static inline u64 vbox_bo_mmap_offset(struct vbox_bo *bo)
 {
-#if RTLNX_VER_MIN(5,4,0)
+#if RTLNX_VER_MIN(5,4,0) || RTLNX_RHEL_MIN(8,3)
         return drm_vma_node_offset_addr(&bo->bo.base.vma_node);
 #elif RTLNX_VER_MAX(3,12,0) && !RTLNX_RHEL_MAJ_PREREQ(7,0)

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

@@ -399 +399 @@
                                                     *connector)
 {
-#if RTLNX_VER_MIN(5,5,0)
+#if RTLNX_VER_MIN(5,5,0) || RTLNX_RHEL_MIN(8,3)
         struct drm_encoder *encoder;
 
@@ -405 +405 @@
         drm_connector_for_each_possible_encoder(connector, encoder)
             return encoder;
-#else /* < 5.5 */
+#else /* < 5.5 || RHEL < 8.3 */
         int enc_id = connector->encoder_ids[0];
 
@@ -415 +415 @@
                 return drm_encoder_find(connector->dev, enc_id);
 # endif
-#endif /* < 5.5 */
+#endif /* < 5.5 || RHEL < 8.3 */
         return NULL;
 }

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

@@ -304 +304 @@
                                  dev->anon_inode->i_mapping,
 #endif
-#if RTLNX_VER_MIN(5,5,0)
+#if RTLNX_VER_MIN(5,5,0) || RTLNX_RHEL_MIN(8,3)
                                  dev->vma_offset_manager,
 #elif RTLNX_VER_MAX(5,2,0) && !RTLNX_RHEL_MAJ_PREREQ(8,2)