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

Timestamp:

Aug 11, 2020 11:18:43 AM (4 years ago)

Author:

vboxsync

Message:

Add/linux/vboxvideo: Try fix ol7.2-ol7.3 breakage. Introducing new macros for testing RHEL minor releases with a major one (VBOX_RHEL_MAJ_PREREQ).

Location:

trunk/src/VBox/Additions/linux/drm

Files:

• vbox_drv.h (modified) (2 diffs)
• vbox_fb.c (modified) (1 diff)

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

@@ -51 +51 @@
 #include <linux/pci.h>
 
+/** @def VBOX_RHEL_MAJ_PREREQ
+ * Require a minium minor release number for the given RedHat release.
+ * @param a_iMajor      RHEL_MAJOR must _equal_ this.
+ * @param a_iMinor      RHEL_MINOR must be greater or equal to this.
+ */
 #if defined(RHEL_MAJOR) && defined(RHEL_MINOR)
+# define VBOX_RHEL_MAJ_PREREQ(a_iMajor, a_iMinor) ((RHEL_MAJOR) == (a_iMajor) && (RHEL_MINOR) >= (a_iMinor))
 # if RHEL_MAJOR == 8 && RHEL_MINOR >= 2
 #  define RHEL_82
@@ -85 +91 @@
 #  define RHEL_70
 # endif
+#else
+# define VBOX_RHEL_MAJ_PREREQ(a_iMajor, a_iMinor) 0
 #endif
 

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

@@ -342 +342 @@
          */
         drm_fb_helper_fill_info(info, &fbdev->helper, sizes);
-#elif (LINUX_VERSION_CODE >= KERNEL_VERSION(4, 11, 0) || defined(RHEL_72)) && !defined(RHEL_82)
+#elif LINUX_VERSION_CODE >= KERNEL_VERSION(4, 11, 0) || VBOX_RHEL_MAJ_PREREQ(7, 5)
         drm_fb_helper_fill_fix(info, fb->pitches[0], fb->format->depth);
 #else