Changeset 84255 in vbox

Timestamp:

May 11, 2020 2:32:23 PM (5 years ago)

Author:

vboxsync

Message:

Linux/GA: ticketref:19391 RedHat 8.2-rc1 kernel DRM backports to 4.18.0 kernels break Virtualbox GAs

Location:

trunk/src/VBox

Files:

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

-              r83073
+              r84255
 #if defined(RHEL_MAJOR) && defined(RHEL_MINOR)
+# if RHEL_MAJOR == 8 && RHEL_MINOR >= 2
+#  define RHEL_82
+# endif
 # if RHEL_MAJOR == 8 && RHEL_MINOR >= 1
 #  define RHEL_81

-              r83878
+              r84255
         info->apertures->ranges[0].size = pci_resource_len(dev->pdev, 0);
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 2, 0)
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 2, 0) || defined(RHEL_82)
+        /*
+         * The corresponding 5.2-rc1 Linux DRM kernel changes have been
+         * also backported to older RedHat based 4.18.0 Linux kernels.
+         */
         drm_fb_helper_fill_info(info, &fbdev->helper, sizes);
 #elif LINUX_VERSION_CODE >= KERNEL_VERSION(4, 11, 0) || defined(RHEL_75)
+#elif (LINUX_VERSION_CODE >= KERNEL_VERSION(4, 11, 0) || defined(RHEL_72)) && !defined(RHEL_82)
         drm_fb_helper_fill_fix(info, fb->pitches[0], fb->format->depth);
 #else
         drm_fb_helper_fill_fix(info, fb->pitches[0], fb->depth);
 #endif
 #if LINUX_VERSION_CODE < KERNEL_VERSION(5, 2, 0)
+#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 2, 0) && !defined(RHEL_82)
         drm_fb_helper_fill_var(info, &fbdev->helper, sizes->fb_width,
                                sizes->fb_height);

r83073	r84255
313	313	#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 5, 0)
314	314	dev->vma_offset_manager,
315		#elif LINUX_VERSION_CODE < KERNEL_VERSION(5, 2, 0)
	315	#elif LINUX_VERSION_CODE < KERNEL_VERSION(5, 2, 0) && !defined(RHEL_82)
316	316	DRM_FILE_PAGE_OFFSET,
317	317	#endif

-              r82968
+              r84255
 #  define RHEL_81
 # endif
+# if RHEL_RELEASE_CODE >= RHEL_RELEASE_VERSION(8, 2)
+#  define RHEL_82
+# endif
 #endif

Note: See TracChangeset for help on using the changeset viewer.