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

Timestamp:

Sep 18, 2020 3:35:52 PM (4 years ago)

Author:

vboxsync

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

140425

Message:

Additions/linux: reverting changesets 140423 & 140424

Location:

trunk/src/VBox/Additions/linux/drm

Files:

• vbox_drv.c (modified) (3 diffs)
• vbox_drv.h (modified) (2 diffs)
• vbox_main.c (modified) (2 diffs)
• vbox_mode.c (modified) (1 diff)
• 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) && !RTLNX_RHEL_MAJ_PREREQ(8,3)
+#if RTLNX_VER_MAX(4,19,0)
         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_MAJ_PREREQ(8,3)
+#if RTLNX_VER_MAX(5,4,0)
         .driver_features =
             DRIVER_MODESET | DRIVER_GEM | DRIVER_HAVE_IRQ |
@@ -311 +311 @@
 # endif
             DRIVER_PRIME,
-#else  /* >= 5.4.0 && RHEL >= 8.3 */
+#else  /* >= 5.4.0 */
         .driver_features = DRIVER_MODESET | DRIVER_GEM | DRIVER_HAVE_IRQ,
-#endif /* <  5.4.0 && < RHEL 8.3 */
+#endif /* <  5.4.0 */
         .dev_priv_size = 0,
 
-#if RTLNX_VER_MAX(4,19,0) && !RTLNX_RHEL_MAJ_PREREQ(8,3)
+#if RTLNX_VER_MAX(4,19,0)
     /* 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_MAJ_PREREQ(8,3)
+#if RTLNX_VER_MAX(5,5,0)
 # include <drm/drmP.h>
-#else /* >= 5.5.0 || RHEL >= 8.3 */
+#else /* >= 5.5.0 */
 # include <drm/drm_file.h>
 # include <drm/drm_drv.h>
@@ -299 +299 @@
 #undef CURSOR_DATA_SIZE
 
-#if RTLNX_VER_MAX(4,19,0) && RTLNX_RHEL_MAX(8,3)
+#if RTLNX_VER_MAX(4,19,0)
 int vbox_driver_load(struct drm_device *dev, unsigned long flags);
 #else

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

@@ -448 +448 @@
 }
 
-#if RTLNX_VER_MAX(4,19,0) && !RTLNX_RHEL_MAJ_PREREQ(8,3)
+#if RTLNX_VER_MAX(4,19,0)
 int vbox_driver_load(struct drm_device *dev, unsigned long flags)
 #else
@@ -622 +622 @@
 static inline u64 vbox_bo_mmap_offset(struct vbox_bo *bo)
 {
-#if RTLNX_VER_MIN(5,4,0) || RTLNX_RHEL_MIN(8,3)
+#if RTLNX_VER_MIN(5,4,0)
         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) || RTLNX_RHEL_MIN(8,3)
+#if RTLNX_VER_MIN(5,5,0)
         struct drm_encoder *encoder;
 

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

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