Changeset 71947 in vbox for trunk/src/VBox/Additions

Timestamp:

Apr 20, 2018 2:59:20 PM (7 years ago)

Author:

vboxsync

Message:

Additions/linux/drm: update drm driver to work with EL7.5, standard kernel.
No bugref.

Location:

trunk/src/VBox/Additions/linux/drm

Files:

• vbox_drv.c (modified) (1 diff)
• vbox_drv.h (modified) (3 diffs)
• vbox_fb.c (modified) (2 diffs)
• vbox_main.c (modified) (3 diffs)
• vbox_mode.c (modified) (2 diffs)
• vbox_ttm.c (modified) (1 diff)

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

@@ -273 +273 @@
         .master_drop = vbox_master_drop,
 #if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 18, 0) || defined(RHEL_73)
-# if LINUX_VERSION_CODE < KERNEL_VERSION(4, 14, 0)
+# if LINUX_VERSION_CODE < KERNEL_VERSION(4, 14, 0) && !defined(RHEL_75)
         .set_busid = drm_pci_set_busid,
 # endif

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

@@ -50 +50 @@
 
 #if defined(RHEL_MAJOR) && defined(RHEL_MINOR)
+# if RHEL_MAJOR == 7 && RHEL_MINOR >= 5
+#  define RHEL_75
+# endif
 # if RHEL_MAJOR == 7 && RHEL_MINOR >= 4
-#  define RHEL_73
 #  define RHEL_74
-# elif RHEL_MAJOR == 7 && RHEL_MINOR >= 3
+# endif
+# if RHEL_MAJOR == 7 && RHEL_MINOR >= 3
 #  define RHEL_73
 # endif
@@ -63 +66 @@
 #endif
 #include <drm/drm_fb_helper.h>
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 11, 0)
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 11, 0) || defined(RHEL_75)
 #include <drm/drm_encoder.h>
 #endif
@@ -160 +163 @@
 
 int vbox_driver_load(struct drm_device *dev, unsigned long flags);
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 11, 0)
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 11, 0) || defined(RHEL_75)
 void vbox_driver_unload(struct drm_device *dev);
 #else

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

@@ -318 +318 @@
         info->fix.smem_len = size;
 
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 11, 0)
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 11, 0) || defined(RHEL_75)
         drm_fb_helper_fill_fix(info, fb->pitches[0], fb->format->depth);
 #else
@@ -401 +401 @@
         drm_fb_helper_prepare(dev, &fbdev->helper, &vbox_fb_helper_funcs);
 #endif
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 11, 0)
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 11, 0) || defined(RHEL_75)
         ret = drm_fb_helper_init(dev, &fbdev->helper, vbox->num_crtcs);
 #else

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

@@ -173 +173 @@
         int ret;
 
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 11, 0)
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 11, 0) || defined(RHEL_75)
         drm_helper_mode_fill_fb_struct(dev, &vbox_fb->base, mode_cmd);
 #else
@@ -405 +405 @@
 }
 
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 11, 0)
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 11, 0) || defined(RHEL_75)
 void vbox_driver_unload(struct drm_device *dev)
 #else
@@ -427 +427 @@
         kfree(vbox);
         dev->dev_private = NULL;
-#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0)
+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0) && !defined(RHEL_75)
         return 0;
 #endif

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

@@ -70 +70 @@
         height = mode->vdisplay ? mode->vdisplay : 480;
         crtc_id = vbox_crtc->crtc_id;
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 11, 0)
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 11, 0) || defined(RHEL_75)
         bpp = crtc->enabled ? CRTC_FB(crtc)->format->cpp[0] * 8 : 32;
         pitch = crtc->enabled ? CRTC_FB(crtc)->pitches[0] : width * bpp / 8;
@@ -94 +94 @@
                 VBoxVideoSetModeRegisters(
                         width, height, pitch * 8 / bpp,
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 11, 0)
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 11, 0) || defined(RHEL_75)
                         CRTC_FB(crtc)->format->cpp[0] * 8,
 #else

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

@@ -268 +268 @@
         .io_mem_reserve = &vbox_ttm_io_mem_reserve,
         .io_mem_free = &vbox_ttm_io_mem_free,
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 12, 0)
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 12, 0) || defined(RHEL_75)
         .io_mem_pfn = ttm_bo_default_io_mem_pfn,
 #endif
 #if (LINUX_VERSION_CODE >= KERNEL_VERSION(4, 7, 0) && LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0)) \
     || defined(RHEL_74)
+# ifndef RHEL_75
         .lru_tail = &ttm_bo_default_lru_tail,
         .swap_lru_tail = &ttm_bo_default_swap_lru_tail,
+# endif
 #endif
 };