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

Timestamp:

Aug 11, 2020 7:05:24 PM (4 years ago)

Author:

vboxsync

Message:

Add/linux/vboxvideo: Use RTLNX_VER_* macros (just copied them over into vbox_drv.h).

Location:

trunk/src/VBox/Additions/linux/drm

Files:

• vbox_drv.c (modified) (16 diffs)
• vbox_drv.h (modified) (16 diffs)
• vbox_fb.c (modified) (12 diffs)
• vbox_hgsmi.c (modified) (1 diff)
• vbox_irq.c (modified) (4 diffs)
• vbox_main.c (modified) (13 diffs)
• vbox_mode.c (modified) (18 diffs)
• vbox_prime.c (modified) (1 diff)
• vbox_ttm.c (modified) (25 diffs)

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

@@ -41 +41 @@
 #include <drm/drm_crtc_helper.h>
 
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 1, 0) || defined(RHEL_81)
+#if RTLNX_VER_MIN(5,1,0) || defined(RHEL_81)
 #include <drm/drm_probe_helper.h>
 #endif
@@ -63 +63 @@
 static int vbox_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
 {
-#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 19, 0)
+#if RTLNX_VER_MAX(4,19,0)
         return drm_get_pci_dev(pdev, ent, &driver);
 #else
@@ -99 +99 @@
         struct drm_device *dev = pci_get_drvdata(pdev);
 
-#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 19, 0)
+#if RTLNX_VER_MAX(4,19,0)
         drm_put_dev(dev);
 #else
@@ -108 +108 @@
 }
 
-#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 9, 0) && !defined(RHEL_74)
+#if RTLNX_VER_MAX(4,9,0) && !defined(RHEL_74)
 static void drm_fb_helper_set_suspend_unlocked(struct drm_fb_helper *fb_helper,
                                         bool suspend)
@@ -226 +226 @@
 };
 
-#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 7, 0) && !defined(RHEL_74)
+#if RTLNX_VER_MAX(4,7,0) && !defined(RHEL_74)
 /* This works around a bug in X servers prior to 1.18.4, which sometimes
  * submit more dirty rectangles than the kernel is willing to handle and
@@ -242 +242 @@
         return rc;
 }
-#endif /* LINUX_VERSION_CODE < KERNEL_VERSION(4, 7, 0) && !RHEL_74 */
+#endif /* RTLNX_VER_MAX(4,7,0) && !RHEL_74 */
 
 static const struct file_operations vbox_fops = {
@@ -248 +248 @@
         .open = drm_open,
         .release = drm_release,
-#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 7, 0) && !defined(RHEL_74)
+#if RTLNX_VER_MAX(4,7,0) && !defined(RHEL_74)
         .unlocked_ioctl = vbox_ioctl,
 #else
@@ -255 +255 @@
         .mmap = vbox_mmap,
         .poll = drm_poll,
-#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 12, 0) && !defined(RHEL_70)
+#if RTLNX_VER_MAX(3,12,0) && !defined(RHEL_70)
         .fasync = drm_fasync,
 #endif
@@ -286 +286 @@
 }
 
-#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 8, 0) && !defined(RHEL_74)
+#if RTLNX_VER_MAX(4,8,0) && !defined(RHEL_74)
 static void vbox_master_drop(struct drm_device *dev,
                              struct drm_file *file_priv, bool from_release)
@@ -305 +305 @@
 
 static struct drm_driver driver = {
-#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 4, 0)
+#if RTLNX_VER_MAX(5,4,0)
         .driver_features =
             DRIVER_MODESET | DRIVER_GEM | DRIVER_HAVE_IRQ |
-# if LINUX_VERSION_CODE < KERNEL_VERSION(5, 1, 0) && !defined(RHEL_81)
+# if RTLNX_VER_MAX(5,1,0) && !defined(RHEL_81)
             DRIVER_IRQ_SHARED |
-# endif /* < KERNEL_VERSION(5, 1, 0) && !defined(RHEL_81) */
+# endif /* < 5.1.0 && !defined(RHEL_81) */
             DRIVER_PRIME,
-#else /* >= KERNEL_VERSION(5, 4, 0) */
+#else  /* >= 5.4.0 */
         .driver_features = DRIVER_MODESET | DRIVER_GEM | DRIVER_HAVE_IRQ,
-#endif /* < KERNEL_VERSION(5, 4, 0) */
+#endif /* <  5.4.0 */
         .dev_priv_size = 0,
 
-#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 19, 0)
+#if RTLNX_VER_MAX(4,19,0)
     /* Legacy hooks, but still supported. */
         .load = vbox_driver_load,
@@ -325 +325 @@
         .master_set = vbox_master_set,
         .master_drop = vbox_master_drop,
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 18, 0) || defined(RHEL_72)
-# if LINUX_VERSION_CODE < KERNEL_VERSION(4, 14, 0) && !defined(RHEL_75) \
+#if RTLNX_VER_MIN(3,18,0) || defined(RHEL_72)
+# if RTLNX_VER_MAX(4,14,0) && !defined(RHEL_75) \
   && !defined(OPENSUSE_151) && !defined(OPENSUSE_125)
         .set_busid = drm_pci_set_busid,
@@ -341 +341 @@
         .patchlevel = DRIVER_PATCHLEVEL,
 
-#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 7, 0)
+#if RTLNX_VER_MAX(4,7,0)
         .gem_free_object = vbox_gem_free_object,
 #else
@@ -348 +348 @@
         .dumb_create = vbox_dumb_create,
         .dumb_map_offset = vbox_dumb_mmap_offset,
-#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 12, 0) && !defined(RHEL_73)
+#if RTLNX_VER_MAX(3,12,0) && !defined(RHEL_73)
         .dumb_destroy = vbox_dumb_destroy,
 #else
@@ -368 +368 @@
 static int __init vbox_init(void)
 {
-#if defined(CONFIG_VGA_CONSOLE) || LINUX_VERSION_CODE >= KERNEL_VERSION(4, 7, 0)
+#if defined(CONFIG_VGA_CONSOLE) || RTLNX_VER_MIN(4,7,0)
         if (vgacon_text_force() && vbox_modeset == -1)
                 return -EINVAL;
@@ -376 +376 @@
                 return -EINVAL;
 
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 18, 0) || defined(RHEL_73)
+#if RTLNX_VER_MIN(3,18,0) || defined(RHEL_73)
         return pci_register_driver(&vbox_pci_driver);
 #else
@@ -385 +385 @@
 static void __exit vbox_exit(void)
 {
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 18, 0) || defined(RHEL_73)
+#if RTLNX_VER_MIN(3,18,0) || defined(RHEL_73)
         pci_unregister_driver(&vbox_pci_driver);
 #else

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

@@ -41 +41 @@
 
 #include <linux/version.h>
-#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 5, 0)
+
+/* iprt/linux/version.h copy - start */
+/** @def RTLNX_VER_MIN
+ * Evaluates to true if the linux kernel version is equal or higher to the
+ * one specfied. */
+#define RTLNX_VER_MIN(a_Major, a_Minor, a_Patch) \
+    (LINUX_VERSION_CODE >= KERNEL_VERSION(a_Major, a_Minor, a_Patch))
+
+/** @def RTLNX_VER_MAX
+ * Evaluates to true if the linux kernel version is less to the one specfied
+ * (exclusive). */
+#define RTLNX_VER_MAX(a_Major, a_Minor, a_Patch) \
+    (LINUX_VERSION_CODE < KERNEL_VERSION(a_Major, a_Minor, a_Patch))
+
+/** @def RTLNX_VER_RANGE
+ * Evaluates to true if the linux kernel version is equal or higher to the given
+ * minimum version and less (but not equal) to the maximum version (exclusive). */
+#define RTLNX_VER_RANGE(a_MajorMin, a_MinorMin, a_PatchMin,  a_MajorMax, a_MinorMax, a_PatchMax) \
+    (   LINUX_VERSION_CODE >= KERNEL_VERSION(a_MajorMin, a_MinorMin, a_PatchMin) \
+     && LINUX_VERSION_CODE <  KERNEL_VERSION(a_MajorMax, a_MinorMax, a_PatchMax) )
+
+
+/** @def RTLNX_RHEL_MIN
+ * Require a minium RedHat release.
+ * @param a_iMajor      The major release number (RHEL_MAJOR).
+ * @param a_iMinor      The minor release number (RHEL_MINOR).
+ * @sa RTLNX_RHEL_MAX, RTLNX_RHEL_RANGE, RTLNX_RHEL_MAJ_PREREQ
+ */
+#if defined(RHEL_MAJOR) && defined(RHEL_MINOR)
+# define RTLNX_RHEL_MIN(a_iMajor, a_iMinor) \
+     ((RHEL_MAJOR) > (a_iMajor) || ((RHEL_MAJOR) == (a_iMajor) && (RHEL_MINOR) >= (a_iMinor)))
+#else
+# define RTLNX_RHEL_MIN(a_iMajor, a_iMinor) (0)
+#endif
+
+/** @def RTLNX_RHEL_MAX
+ * Require a maximum RedHat release, true for all RHEL versions below it.
+ * @param a_iMajor      The major release number (RHEL_MAJOR).
+ * @param a_iMinor      The minor release number (RHEL_MINOR).
+ * @sa RTLNX_RHEL_MIN, RTLNX_RHEL_RANGE, RTLNX_RHEL_MAJ_PREREQ
+ */
+#if defined(RHEL_MAJOR) && defined(RHEL_MINOR)
+# define RTLNX_RHEL_MAX(a_iMajor, a_iMinor) \
+     ((RHEL_MAJOR) < (a_iMajor) || ((RHEL_MAJOR) == (a_iMajor) && (RHEL_MINOR) < (a_iMinor)))
+#else
+# define RTLNX_RHEL_MAX(a_iMajor, a_iMinor) (0)
+#endif
+
+/** @define RTLNX_RHEL_RANGE
+ * Check that it's a RedHat kernel in the given version range.
+ * The max version is exclusive, the minimum inclusive.
+ * @sa RTLNX_RHEL_MIN, RTLNX_RHEL_MAX, RTLNX_RHEL_MAJ_PREREQ
+ */
+#if defined(RHEL_MAJOR) && defined(RHEL_MINOR)
+# define RTLNX_RHEL_RANGE(a_iMajorMin, a_iMinorMin,  a_iMajorMax, a_iMinorMax) \
+     (RTLNX_RHEL_MIN(a_iMajorMin, a_iMinorMin) && RTLNX_RHEL_MAX(a_iMajorMax, a_iMinorMax))
+#else
+# define RTLNX_RHEL_RANGE(a_iMajorMin, a_iMinorMin,  a_iMajorMax, a_iMinorMax)  (0)
+#endif
+
+/** @def RTLNX_RHEL_MAJ_PREREQ
+ * Require a minimum 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.
+ * @sa RTLNX_RHEL_MIN, RTLNX_RHEL_MAX
+ */
+#if defined(RHEL_MAJOR) && defined(RHEL_MINOR)
+# define RTLNX_RHEL_MAJ_PREREQ(a_iMajor, a_iMinor) ((RHEL_MAJOR) == (a_iMajor) && (RHEL_MINOR) >= (a_iMinor))
+#else
+# define RTLNX_RHEL_MAJ_PREREQ(a_iMajor, a_iMinor) (0)
+#endif
+
+
+/** @def RTLNX_SUSE_MAJ_PREREQ
+ * Require a minimum minor release number for the given SUSE release.
+ * @param a_iMajor      CONFIG_SUSE_VERSION must _equal_ this.
+ * @param a_iMinor      CONFIG_SUSE_PATCHLEVEL must be greater or equal to this.
+ */
+#if defined(CONFIG_SUSE_VERSION) && defined(CONFIG_SUSE_PATCHLEVEL)
+# define RTLNX_SUSE_MAJ_PREREQ(a_iMajor, a_iMinor) ((CONFIG_SUSE_VERSION) == (a_iMajor) && (CONFIG_SUSE_PATCHLEVEL) >= (a_iMinor))
+#else
+# define RTLNX_SUSE_MAJ_PREREQ(a_iMajor, a_iMinor) (0)
+#endif
+/* iprt/linux/version.h copy - end */
+
+#if RTLNX_VER_MAX(4,5,0)
 # include <linux/types.h>
 # include <linux/spinlock_types.h>
@@ -104 +189 @@
 #endif
 
-#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 14, 0) || defined(RHEL_71)
+#if RTLNX_VER_MAX(3,14,0) || defined(RHEL_71)
 #define U8_MAX          ((u8)~0U)
 #define S8_MAX          ((s8)(U8_MAX>>1))
@@ -119 +204 @@
 #endif
 
-#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 5, 0)
+#if RTLNX_VER_MAX(5,5,0)
 #include <drm/drmP.h>
-#else /* >= KERNEL_VERSION(5, 5, 0) */
+#else /* >= 5.5.0 */
 #include <drm/drm_file.h>
 #include <drm/drm_drv.h>
@@ -129 +214 @@
 #include <drm/drm_irq.h>
 #include <drm/drm_vblank.h>
-#endif /* >= KERNEL_VERSION(5, 5, 0) */
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 11, 0) || defined(RHEL_75)
+#endif /* >= 5.5.0 */
+#if RTLNX_VER_MIN(4,11,0) || defined(RHEL_75)
 #include <drm/drm_encoder.h>
 #endif
 #include <drm/drm_fb_helper.h>
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 18, 0) || defined(RHEL_72)
+#if RTLNX_VER_MIN(3,18,0) || defined(RHEL_72)
 #include <drm/drm_gem.h>
 #endif
@@ -150 +235 @@
 #include "product-generated.h"
 
-#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 12, 0) && !defined(RHEL_75)
+#if RTLNX_VER_MAX(4,12,0) && !defined(RHEL_75)
 static inline void drm_gem_object_put_unlocked(struct drm_gem_object *obj)
 {
@@ -157 +242 @@
 #endif
 
-#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 12, 0) && !defined(RHEL_75)
+#if RTLNX_VER_MAX(4,12,0) && !defined(RHEL_75)
 static inline void drm_gem_object_put(struct drm_gem_object *obj)
 {
@@ -191 +276 @@
 #define VBOX_REFRESH_PERIOD (HZ / 2)
 
-#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 13, 0) && !defined(RHEL_72)
+#if RTLNX_VER_MAX(3,13,0) && !defined(RHEL_72)
 static inline void *devm_kcalloc(struct device *dev, size_t n, size_t size,
                                  gfp_t flags)
@@ -222 +307 @@
 
         struct {
-#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 0, 0) && !defined(RHEL_77) && !defined(RHEL_81)
+#if RTLNX_VER_MAX(5,0,0) && !defined(RHEL_77) && !defined(RHEL_81)
                 struct drm_global_reference mem_global_ref;
                 struct ttm_bo_global_ref bo_global_ref;
@@ -266 +351 @@
 #undef CURSOR_DATA_SIZE
 
-#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 19, 0)
+#if RTLNX_VER_MAX(4,19,0)
 int vbox_driver_load(struct drm_device *dev, unsigned long flags);
 #else
 int vbox_driver_load(struct drm_device *dev);
 #endif
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 11, 0) || defined(RHEL_75)
+#if RTLNX_VER_MIN(4,11,0) || defined(RHEL_75)
 void vbox_driver_unload(struct drm_device *dev);
 #else
@@ -333 +418 @@
 void vbox_mode_fini(struct drm_device *dev);
 
-#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 3, 0)
+#if RTLNX_VER_MAX(3,3,0)
 #define DRM_MODE_FB_CMD drm_mode_fb_cmd
 #else
@@ -339 +424 @@
 #endif
 
-#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 15, 0) && !defined(RHEL_71)
+#if RTLNX_VER_MAX(3,15,0) && !defined(RHEL_71)
 #define CRTC_FB(crtc) ((crtc)->fb)
 #else
@@ -355 +440 @@
 int vbox_framebuffer_init(struct drm_device *dev,
                           struct vbox_framebuffer *vbox_fb,
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 5, 0) || defined(RHEL_73)
+#if RTLNX_VER_MIN(4,5,0) || defined(RHEL_73)
                           const struct DRM_MODE_FB_CMD *mode_cmd,
 #else
@@ -371 +456 @@
         struct ttm_bo_kmap_obj kmap;
         struct drm_gem_object gem;
-#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 18, 0) && !defined(RHEL_72)
+#if RTLNX_VER_MAX(3,18,0) && !defined(RHEL_72)
         u32 placements[3];
 #else
@@ -391 +476 @@
                      struct drm_device *dev,
                      struct drm_mode_create_dumb *args);
-#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 12, 0) && !defined(RHEL_73)
+#if RTLNX_VER_MAX(3,12,0) && !defined(RHEL_73)
 int vbox_dumb_destroy(struct drm_file *file,
                       struct drm_device *dev, u32 handle);
@@ -419 +504 @@
         int ret;
 
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 7, 0) || defined(RHEL_74)
+#if RTLNX_VER_MIN(4,7,0) || defined(RHEL_74)
         ret = ttm_bo_reserve(&bo->bo, true, no_wait, NULL);
 #else
@@ -445 +530 @@
 void vbox_gem_prime_unpin(struct drm_gem_object *obj);
 struct sg_table *vbox_gem_prime_get_sg_table(struct drm_gem_object *obj);
-#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 18, 0) && !defined(RHEL_72)
+#if RTLNX_VER_MAX(3,18,0) && !defined(RHEL_72)
 struct drm_gem_object *vbox_gem_prime_import_sg_table(
         struct drm_device *dev, size_t size, struct sg_table *table);

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

@@ -51 +51 @@
 #include <VBoxVideo.h>
 
-#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 7, 0) && !defined(RHEL_74)
+#if RTLNX_VER_MAX(4,7,0) && !defined(RHEL_74)
 /**
  * Tell the host about dirty rectangles to update.
@@ -127 +127 @@
 
 #ifdef CONFIG_FB_DEFERRED_IO
-# if LINUX_VERSION_CODE < KERNEL_VERSION(4, 7, 0) && !defined(RHEL_74)
+# if RTLNX_VER_MAX(4,7,0) && !defined(RHEL_74)
 static void drm_fb_helper_deferred_io(struct fb_info *info, struct list_head *pagelist)
 {
@@ -160 +160 @@
 #endif
 
-#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 3, 0) && !defined(RHEL_73)
+#if RTLNX_VER_MAX(4,3,0) && !defined(RHEL_73)
 static void drm_fb_helper_sys_fillrect(struct fb_info *info, const struct fb_fillrect *rect)
 {
@@ -208 +208 @@
         u32 size;
         struct drm_gem_object *gobj;
-#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 3, 0)
+#if RTLNX_VER_MAX(3,3,0)
         u32 pitch = mode_cmd->pitch;
 #else
@@ -226 +226 @@
 }
 
-#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 3, 0) && !defined(RHEL_73)
+#if RTLNX_VER_MAX(4,3,0) && !defined(RHEL_73)
 static struct fb_info *drm_fb_helper_alloc_fbi(struct drm_fb_helper *helper)
 {
@@ -268 +268 @@
         mode_cmd.height = sizes->surface_height;
         pitch = mode_cmd.width * ((sizes->surface_bpp + 7) / 8);
-#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 3, 0)
+#if RTLNX_VER_MAX(3,3,0)
         mode_cmd.bpp = sizes->surface_bpp;
         mode_cmd.depth = sizes->surface_depth;
@@ -336 +336 @@
         info->apertures->ranges[0].size = pci_resource_len(dev->pdev, 0);
 
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 2, 0) || defined(RHEL_82)
+#if RTLNX_VER_MIN(5,2,0) || defined(RHEL_82)
         /*
          * The corresponding 5.2-rc1 Linux DRM kernel changes have been
@@ -342 +342 @@
          */
         drm_fb_helper_fill_info(info, &fbdev->helper, sizes);
-#elif LINUX_VERSION_CODE >= KERNEL_VERSION(4, 11, 0) || VBOX_RHEL_MAJ_PREREQ(7, 5)
+#elif RTLNX_VER_MIN(4,11,0) || VBOX_RHEL_MAJ_PREREQ(7, 5)
         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) && !defined(RHEL_82)
+#if RTLNX_VER_MAX(5,2,0) && !defined(RHEL_82)
         drm_fb_helper_fill_var(info, &fbdev->helper, sizes->fb_width,
                                sizes->fb_height);
@@ -371 +371 @@
 };
 
-#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 3, 0) && !defined(RHEL_73)
+#if RTLNX_VER_MAX(4,3,0) && !defined(RHEL_73)
 static void drm_fb_helper_unregister_fbi(struct drm_fb_helper *fb_helper)
 {
@@ -411 +411 @@
         drm_fb_helper_fini(&fbdev->helper);
 
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 9, 0)
+#if RTLNX_VER_MIN(3,9,0)
         drm_framebuffer_unregister_private(&afb->base);
 #endif
@@ -430 +430 @@
         spin_lock_init(&fbdev->dirty_lock);
 
-#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 17, 0) && !defined(RHEL_72)
+#if RTLNX_VER_MAX(3,17,0) && !defined(RHEL_72)
         fbdev->helper.funcs = &vbox_fb_helper_funcs;
 #else
         drm_fb_helper_prepare(dev, &fbdev->helper, &vbox_fb_helper_funcs);
 #endif
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 7, 0)
+#if RTLNX_VER_MIN(5,7,0)
         ret = drm_fb_helper_init(dev, &fbdev->helper);
-#elif LINUX_VERSION_CODE >= KERNEL_VERSION(4, 11, 0) || defined(RHEL_75)
+#elif RTLNX_VER_MIN(4,11,0) || defined(RHEL_75)
         ret = drm_fb_helper_init(dev, &fbdev->helper, vbox->num_crtcs);
-#else /* KERNEL_VERSION < 4.11.0 */
+#else /* < 4.11.0 */
         ret =
             drm_fb_helper_init(dev, &fbdev->helper, vbox->num_crtcs,
@@ -447 +447 @@
                 return ret;
 
-#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 7, 0)
+#if RTLNX_VER_MAX(5,7,0)
         ret = drm_fb_helper_single_add_all_connectors(&fbdev->helper);
         if (ret)

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

@@ -69 +69 @@
 }
 
-#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 13, 0)
+#if RTLNX_VER_MAX(3,13,0)
 void *gen_pool_dma_alloc(struct gen_pool *pool, size_t size, dma_addr_t *dma)
 {

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

@@ -34 +34 @@
 #include "vbox_drv.h"
 
-#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 1, 0)
+#if RTLNX_VER_MAX(5,1,0)
 #include <drm/drm_crtc_helper.h>
 # if defined(RHEL_81)
@@ -152 +152 @@
 
         validate_or_set_position_hints(vbox);
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 9, 0)
+#if RTLNX_VER_MIN(3,9,0)
         drm_modeset_lock_all(dev);
 #else
@@ -186 +186 @@
                 vbox_conn->vbox_crtc->disconnected = disconnected;
         }
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 9, 0)
+#if RTLNX_VER_MIN(3,9,0)
         drm_modeset_unlock_all(dev);
 #else
@@ -206 +206 @@
         INIT_WORK(&vbox->hotplug_work, vbox_hotplug_worker);
         vbox_update_mode_hints(vbox);
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 16, 0) || defined(RHEL_71)
+#if RTLNX_VER_MIN(3,16,0) || defined(RHEL_71)
         return drm_irq_install(vbox->dev, vbox->dev->pdev->irq);
 #else

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

@@ -164 +164 @@
 int vbox_framebuffer_init(struct drm_device *dev,
                           struct vbox_framebuffer *vbox_fb,
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 5, 0) || defined(RHEL_73)
+#if RTLNX_VER_MIN(4,5,0) || defined(RHEL_73)
                           const struct DRM_MODE_FB_CMD *mode_cmd,
 #else
@@ -173 +173 @@
         int ret;
 
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 11, 0) || defined(RHEL_75)
+#if RTLNX_VER_MIN(4,11,0) || defined(RHEL_75)
         drm_helper_mode_fill_fb_struct(dev, &vbox_fb->base, mode_cmd);
 #else
@@ -191 +191 @@
                 struct drm_device *dev,
                 struct drm_file *filp,
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 5, 0) || defined(RHEL_73)
+#if RTLNX_VER_MIN(4,5,0) || defined(RHEL_73)
                 const struct drm_mode_fb_cmd2 *mode_cmd)
 #else
@@ -201 +201 @@
         int ret = -ENOMEM;
 
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 7, 0) || defined(RHEL_74)
+#if RTLNX_VER_MIN(4,7,0) || defined(RHEL_74)
         obj = drm_gem_object_lookup(filp, mode_cmd->handles[0]);
 #else
@@ -230 +230 @@
 };
 
-#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 0, 0) && !defined(RHEL_73)
+#if RTLNX_VER_MAX(4,0,0) && !defined(RHEL_73)
 #define pci_iomap_range(dev, bar, offset, maxlen) \
         ioremap(pci_resource_start(dev, bar) + (offset), maxlen)
@@ -448 +448 @@
 }
 
-#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 19, 0)
+#if RTLNX_VER_MAX(4,19,0)
 int vbox_driver_load(struct drm_device *dev, unsigned long flags)
 #else
@@ -512 +512 @@
 }
 
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 11, 0) || defined(RHEL_75)
+#if RTLNX_VER_MIN(4,11,0) || defined(RHEL_75)
 void vbox_driver_unload(struct drm_device *dev)
 #else
@@ -526 +526 @@
         vbox_mm_fini(vbox);
         vbox_hw_fini(vbox);
-#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0) && !defined(RHEL_75)
+#if RTLNX_VER_MAX(4,11,0) && !defined(RHEL_75)
         return 0;
 #endif
@@ -539 +539 @@
         struct vbox_private *vbox = dev->dev_private;
 
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 16, 0) || defined(RHEL_71)
+#if RTLNX_VER_MIN(3,16,0) || defined(RHEL_71)
         if (vbox->fbdev)
                 drm_fb_helper_restore_fbdev_mode_unlocked(&vbox->fbdev->helper);
@@ -598 +598 @@
 }
 
-#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 12, 0) && !defined(RHEL_73)
+#if RTLNX_VER_MAX(3,12,0) && !defined(RHEL_73)
 int vbox_dumb_destroy(struct drm_file *file,
                       struct drm_device *dev, u32 handle)
@@ -606 +606 @@
 #endif
 
-#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 19, 0) && !defined(OPENSUSE_151) && !defined(OPENSUSE_125) \
+#if RTLNX_VER_MAX(4,19,0) && !defined(OPENSUSE_151) && !defined(OPENSUSE_125) \
   && !defined(RHEL_77) && !defined(RHEL_81)
 static void ttm_bo_put(struct ttm_buffer_object *bo)
@@ -623 +623 @@
 static inline u64 vbox_bo_mmap_offset(struct vbox_bo *bo)
 {
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 4, 0)
+#if RTLNX_VER_MIN(5,4,0)
         return drm_vma_node_offset_addr(&bo->bo.base.vma_node);
-#elif LINUX_VERSION_CODE < KERNEL_VERSION(3, 12, 0) && !defined(RHEL_70)
+#elif RTLNX_VER_MAX(3,12,0) && !defined(RHEL_70)
         return bo->bo.addr_space_offset;
 #else
         return drm_vma_node_offset_addr(&bo->bo.vma_node);
-#endif /* >= KERNEL_VERSION(5, 4, 0) */
+#endif /* >= 5.4.0 */
 }
 
@@ -642 +642 @@
 
         mutex_lock(&dev->struct_mutex);
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 7, 0) || defined(RHEL_74)
+#if RTLNX_VER_MIN(4,7,0) || defined(RHEL_74)
         obj = drm_gem_object_lookup(file, handle);
 #else

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

@@ -40 +40 @@
 #include <linux/export.h>
 #include <drm/drm_crtc_helper.h>
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 18, 0) || defined(RHEL_72)
+#if RTLNX_VER_MIN(3,18,0) || defined(RHEL_72)
 #include <drm/drm_plane_helper.h>
 #endif
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 1, 0) || defined(RHEL_81)
+#if RTLNX_VER_MIN(5,1,0) || defined(RHEL_81)
 #include <drm/drm_probe_helper.h>
 #endif
@@ -70 +70 @@
         width = mode->hdisplay ? mode->hdisplay : 640;
         height = mode->vdisplay ? mode->vdisplay : 480;
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 11, 0) || defined(RHEL_75)
+#if RTLNX_VER_MIN(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;
-#elif LINUX_VERSION_CODE >= KERNEL_VERSION(3, 3, 0)
+#elif RTLNX_VER_MIN(3,3,0)
         bpp = crtc->enabled ? CRTC_FB(crtc)->bits_per_pixel : 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) || defined(RHEL_75)
+#if RTLNX_VER_MIN(4,11,0) || defined(RHEL_75)
                         CRTC_FB(crtc)->format->cpp[0] * 8,
 #else
@@ -285 +285 @@
 static int vbox_crtc_page_flip(struct drm_crtc *crtc,
                                struct drm_framebuffer *fb,
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 12, 0) || defined(RHEL_75)
+#if RTLNX_VER_MIN(4,12,0) || defined(RHEL_75)
                                struct drm_pending_vblank_event *event,
                                uint32_t page_flip_flags,
                                struct drm_modeset_acquire_ctx *ctx)
-#elif LINUX_VERSION_CODE >= KERNEL_VERSION(3, 12, 0) || defined(RHEL_70)
+#elif RTLNX_VER_MIN(3,12,0) || defined(RHEL_70)
                                struct drm_pending_vblank_event *event,
                                uint32_t page_flip_flags)
@@ -311 +311 @@
 
         if (event)
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 19, 0) || defined(RHEL_72)
+#if RTLNX_VER_MIN(3,19,0) || defined(RHEL_72)
                 drm_crtc_send_vblank_event(crtc, event);
 #else
@@ -386 +386 @@
 }
 
-#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 13, 0) && !defined(RHEL_71)
+#if RTLNX_VER_MAX(3,13,0) && !defined(RHEL_71)
 static struct drm_encoder *drm_encoder_find(struct drm_device *dev, u32 id)
 {
@@ -399 +399 @@
                                                     *connector)
 {
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 5, 0)
+#if RTLNX_VER_MIN(5,5,0)
         struct drm_encoder *encoder;
 
@@ -405 +405 @@
         drm_connector_for_each_possible_encoder(connector, encoder)
             return encoder;
-#else /* KERNEL_VERSION < 5.5 */
+#else /* < 5.5 */
         int enc_id = connector->encoder_ids[0];
 
         /* pick the encoder ids */
         if (enc_id)
-# if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 15, 0) || \
+# if RTLNX_VER_MIN(4,15,0) || \
      (defined(CONFIG_SUSE_VERSION) && \
-         LINUX_VERSION_CODE >= KERNEL_VERSION(4, 12, 0)) || \
+         RTLNX_VER_MIN(4,12,0)) || \
      defined(RHEL_76)
                 return drm_encoder_find(connector->dev, NULL, enc_id);
@@ -418 +418 @@
                 return drm_encoder_find(connector->dev, enc_id);
 # endif
-#endif /* KERNEL_VERSION < 5.5 */
+#endif /* < 5.5 */
         return NULL;
 }
@@ -469 +469 @@
 
         drm_encoder_init(dev, &vbox_encoder->base, &vbox_enc_funcs,
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 5, 0) || defined(RHEL_73)
+#if RTLNX_VER_MIN(4,5,0) || defined(RHEL_73)
                          DRM_MODE_ENCODER_DAC, NULL);
 #else
@@ -548 +548 @@
                 sum += edid[i];
         edid[EDID_SIZE - 1] = (0x100 - (sum & 0xFF)) & 0xFF;
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 19, 0) || defined(OPENSUSE_151) || defined(OPENSUSE_125) \
+#if RTLNX_VER_MIN(4,19,0) || defined(OPENSUSE_151) || defined(OPENSUSE_125) \
   || defined(RHEL_77) || defined(RHEL_81)
         drm_connector_update_edid_property(connector, (struct edid *)edid);
@@ -607 +607 @@
         vbox_set_edid(connector, preferred_width, preferred_height);
 
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 19, 0) || defined(RHEL_72)
+#if RTLNX_VER_MIN(3,19,0) || defined(RHEL_72)
         if (vbox_connector->vbox_crtc->x_hint != -1)
                 drm_object_property_set_value(&connector->base,
@@ -628 +628 @@
 }
 
-#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 14, 0) && !defined(RHEL_71)
+#if RTLNX_VER_MAX(3,14,0) && !defined(RHEL_71)
 static int vbox_mode_valid(struct drm_connector *connector,
 #else
@@ -640 +640 @@
 static void vbox_connector_destroy(struct drm_connector *connector)
 {
-#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 17, 0) && !defined(RHEL_72)
+#if RTLNX_VER_MAX(3,17,0) && !defined(RHEL_72)
         drm_sysfs_connector_remove(connector);
 #else
@@ -711 +711 @@
         connector->doublescan_allowed = 0;
 
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 19, 0) || defined(RHEL_72)
+#if RTLNX_VER_MIN(3,19,0) || defined(RHEL_72)
         drm_mode_create_suggested_offset_properties(dev);
         drm_object_attach_property(&connector->base,
@@ -718 +718 @@
                                    dev->mode_config.suggested_y_property, 0);
 #endif
-#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 17, 0) && !defined(RHEL_72)
+#if RTLNX_VER_MAX(3,17,0) && !defined(RHEL_72)
         drm_sysfs_connector_add(connector);
 #else
@@ -724 +724 @@
 #endif
 
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 19, 0) || defined(OPENSUSE_151) || defined(OPENSUSE_125) \
+#if RTLNX_VER_MIN(4,19,0) || defined(OPENSUSE_151) || defined(OPENSUSE_125) \
   || defined(RHEL_77) || defined(RHEL_81)
         drm_connector_attach_encoder(connector, encoder);
@@ -833 +833 @@
         }
 
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 7, 0) || defined(RHEL_74)
+#if RTLNX_VER_MIN(4,7,0) || defined(RHEL_74)
         obj = drm_gem_object_lookup(file_priv, handle);
 #else

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

@@ -50 +50 @@
 }
 
-#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 18, 0) && !defined(RHEL_72)
+#if RTLNX_VER_MAX(3,18,0) && !defined(RHEL_72)
 struct drm_gem_object *vbox_gem_prime_import_sg_table(
         struct drm_device *dev, size_t size, struct sg_table *table)

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

@@ -36 +36 @@
 #include <drm/ttm/ttm_page_alloc.h>
 
-#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 18, 0) && !defined(RHEL_72)
+#if RTLNX_VER_MAX(3,18,0) && !defined(RHEL_72)
 #define PLACEMENT_FLAGS(placement) (placement)
 #else
@@ -47 +47 @@
 }
 
-#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 0, 0) && !defined(RHEL_77) && !defined(RHEL_81)
+#if RTLNX_VER_MAX(5,0,0) && !defined(RHEL_77) && !defined(RHEL_81)
 static int vbox_ttm_mem_global_init(struct drm_global_reference *ref)
 {
@@ -66 +66 @@
         int ret;
 
-#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 0, 0)
+#if RTLNX_VER_MAX(5,0,0)
         global_ref = &vbox->ttm.mem_global_ref;
         global_ref->global_type = DRM_GLOBAL_TTM_MEM;
@@ -89 +89 @@
         if (ret) {
                 DRM_ERROR("Failed setting up TTM BO subsystem.\n");
-#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 0, 0)
+#if RTLNX_VER_MAX(5,0,0)
                 drm_global_item_unref(&vbox->ttm.mem_global_ref);
 #endif
@@ -211 +211 @@
 };
 
-#if (LINUX_VERSION_CODE < KERNEL_VERSION(4, 17, 0)) && !defined(RHEL_76) \
+#if (RTLNX_VER_MAX(4,17,0)) && !defined(RHEL_76) \
   && !defined(OPENSUSE_151) && !defined(OPENSUSE_125)
 static struct ttm_tt *vbox_ttm_tt_create(struct ttm_bo_device *bdev,
@@ -229 +229 @@
 
         tt->func = &vbox_tt_backend_func;
-#if (LINUX_VERSION_CODE < KERNEL_VERSION(4, 17, 0)) && !defined(RHEL_76) \
+#if (RTLNX_VER_MAX(4,17,0)) && !defined(RHEL_76) \
   && !defined(OPENSUSE_151) && !defined(OPENSUSE_125)
         if (ttm_tt_init(tt, bdev, size, page_flags, dummy_read_page)) {
@@ -242 +242 @@
 }
 
-#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 17, 0)
-# if (LINUX_VERSION_CODE < KERNEL_VERSION(4, 16, 0)) && !defined(RHEL_76) \
+#if RTLNX_VER_MAX(4,17,0)
+# if (RTLNX_VER_MAX(4,16,0)) && !defined(RHEL_76) \
   && !defined(OPENSUSE_151) && !defined(OPENSUSE_125)
 static int vbox_ttm_tt_populate(struct ttm_tt *ttm)
@@ -265 +265 @@
 static struct ttm_bo_driver vbox_bo_driver = {
         .ttm_tt_create = vbox_ttm_tt_create,
-#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 17, 0)
+#if RTLNX_VER_MAX(4,17,0)
         .ttm_tt_populate = vbox_ttm_tt_populate,
         .ttm_tt_unpopulate = vbox_ttm_tt_unpopulate,
 #endif
         .init_mem_type = vbox_bo_init_mem_type,
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 10, 0) || defined(RHEL_74)
+#if RTLNX_VER_MIN(4,10,0) || defined(RHEL_74)
         .eviction_valuable = ttm_bo_eviction_valuable,
 #endif
@@ -277 +277 @@
         .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) || defined(RHEL_75)
-# if (LINUX_VERSION_CODE < KERNEL_VERSION(4, 16, 0)) && !defined(RHEL_76) \
+#if RTLNX_VER_MIN(4,12,0) || defined(RHEL_75)
+# if (RTLNX_VER_MAX(4,16,0)) && !defined(RHEL_76) \
   && !defined(OPENSUSE_151) && !defined(OPENSUSE_125)
         .io_mem_pfn = ttm_bo_default_io_mem_pfn,
 # endif
 #endif
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4, 7, 0) && LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0)) \
-    || defined(RHEL_74)
-# ifndef RHEL_75
+#if (RTLNX_VER_RANGE(4,7,0,  4,11,0) || defined(RHEL_74)) && !defined(RHEL_75)
         .lru_tail = &ttm_bo_default_lru_tail,
         .swap_lru_tail = &ttm_bo_default_swap_lru_tail,
-# endif
 #endif
 };
@@ -298 +295 @@
         struct ttm_bo_device *bdev = &vbox->ttm.bdev;
 
-#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 0, 0) && !defined(RHEL_77) && !defined(RHEL_81)
+#if RTLNX_VER_MAX(5,0,0) && !defined(RHEL_77) && !defined(RHEL_81)
         ret = vbox_ttm_global_init(vbox);
         if (ret)
@@ -304 +301 @@
 #endif
         ret = ttm_bo_device_init(&vbox->ttm.bdev,
-#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 0, 0) && !defined(RHEL_77) && !defined(RHEL_81)
+#if RTLNX_VER_MAX(5,0,0) && !defined(RHEL_77) && !defined(RHEL_81)
                                  vbox->ttm.bo_global_ref.ref.object,
 #endif
                                  &vbox_bo_driver,
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 15, 0) || defined(RHEL_71)
+#if RTLNX_VER_MIN(3,15,0) || defined(RHEL_71)
                                  dev->anon_inode->i_mapping,
 #endif
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 5, 0)
+#if RTLNX_VER_MIN(5,5,0)
                                  dev->vma_offset_manager,
-#elif LINUX_VERSION_CODE < KERNEL_VERSION(5, 2, 0) && !defined(RHEL_82)
+#elif RTLNX_VER_MAX(5,2,0) && !defined(RHEL_82)
                                  DRM_FILE_PAGE_OFFSET,
 #endif
@@ -319 +316 @@
         if (ret) {
                 DRM_ERROR("Error initialising bo driver; %d\n", ret);
-#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 0, 0) && !defined(RHEL_77) && !defined(RHEL_81)
+#if RTLNX_VER_MAX(5,0,0) && !defined(RHEL_77) && !defined(RHEL_81)
                 goto err_ttm_global_release;
 #else
@@ -345 +342 @@
 err_device_release:
         ttm_bo_device_release(&vbox->ttm.bdev);
-#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 0, 0) && !defined(RHEL_77) && !defined(RHEL_81)
+#if RTLNX_VER_MAX(5,0,0) && !defined(RHEL_77) && !defined(RHEL_81)
 err_ttm_global_release:
         vbox_ttm_global_release(vbox);
@@ -362 +359 @@
 #endif
         ttm_bo_device_release(&vbox->ttm.bdev);
-#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 0, 0) && !defined(RHEL_77) && !defined(RHEL_81)
+#if RTLNX_VER_MAX(5,0,0) && !defined(RHEL_77) && !defined(RHEL_81)
         vbox_ttm_global_release(vbox);
 #endif
@@ -370 +367 @@
 {
         u32 c = 0;
-#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 18, 0) && !defined(RHEL_72)
+#if RTLNX_VER_MAX(3,18,0) && !defined(RHEL_72)
         bo->placement.fpfn = 0;
         bo->placement.lpfn = 0;
@@ -393 +390 @@
         bo->placement.num_busy_placement = c;
 
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 18, 0) || defined(RHEL_72)
+#if RTLNX_VER_MIN(3,18,0) || defined(RHEL_72)
         for (i = 0; i < c; ++i) {
                 bo->placements[i].fpfn = 0;
@@ -418 +415 @@
 
         vboxbo->bo.bdev = &vbox->ttm.bdev;
-#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 15, 0) && !defined(RHEL_71)
+#if RTLNX_VER_MAX(3,15,0) && !defined(RHEL_71)
         vboxbo->bo.bdev->dev_mapping = dev->dev_mapping;
 #endif
@@ -429 +426 @@
         ret = ttm_bo_init(&vbox->ttm.bdev, &vboxbo->bo, size,
                           ttm_bo_type_device, &vboxbo->placement,
-#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 17, 0) && !defined(RHEL_76) \
+#if RTLNX_VER_MAX(4,17,0) && !defined(RHEL_76) \
   && !defined(OPENSUSE_151) && !defined(OPENSUSE_125)
                           align >> PAGE_SHIFT, false, NULL, acc_size,
@@ -435 +432 @@
                           align >> PAGE_SHIFT, false, acc_size,
 #endif
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 18, 0) || defined(RHEL_72)
+#if RTLNX_VER_MIN(3,18,0) || defined(RHEL_72)
                           NULL, NULL, vbox_bo_ttm_destroy);
 #else
@@ -459 +456 @@
 int vbox_bo_pin(struct vbox_bo *bo, u32 pl_flag, u64 *gpu_addr)
 {
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4, 16, 0)) || defined(RHEL_76) \
+#if (RTLNX_VER_MIN(4,16,0)) || defined(RHEL_76) \
   || defined(OPENSUSE_151) || defined(OPENSUSE_125)
         struct ttm_operation_ctx ctx = { false, false };
@@ -478 +475 @@
                 PLACEMENT_FLAGS(bo->placements[i]) |= TTM_PL_FLAG_NO_EVICT;
 
-#if (LINUX_VERSION_CODE < KERNEL_VERSION(4, 16, 0)) && !defined(RHEL_76) \
+#if (RTLNX_VER_MAX(4,16,0)) && !defined(RHEL_76) \
   && !defined(OPENSUSE_151) && !defined(OPENSUSE_125)
         ret = ttm_bo_validate(&bo->bo, &bo->placement, false, false);
@@ -497 +494 @@
 int vbox_bo_unpin(struct vbox_bo *bo)
 {
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4, 16, 0)) || defined(RHEL_76) \
+#if (RTLNX_VER_MIN(4,16,0)) || defined(RHEL_76) \
   || defined(OPENSUSE_151) || defined(OPENSUSE_125)
         struct ttm_operation_ctx ctx = { false, false };
@@ -514 +511 @@
                 PLACEMENT_FLAGS(bo->placements[i]) &= ~TTM_PL_FLAG_NO_EVICT;
 
-#if (LINUX_VERSION_CODE < KERNEL_VERSION(4, 16, 0)) && !defined(RHEL_76) \
+#if (RTLNX_VER_MAX(4,16,0)) && !defined(RHEL_76) \
   && !defined(OPENSUSE_151) && !defined(OPENSUSE_125)
         ret = ttm_bo_validate(&bo->bo, &bo->placement, false, false);
@@ -533 +530 @@
 int vbox_bo_push_sysram(struct vbox_bo *bo)
 {
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4, 16, 0)) || defined(RHEL_76) \
+#if (RTLNX_VER_MIN(4,16,0)) || defined(RHEL_76) \
   || defined(OPENSUSE_151) || defined(OPENSUSE_125)
         struct ttm_operation_ctx ctx = { false, false };
@@ -555 +552 @@
                 PLACEMENT_FLAGS(bo->placements[i]) |= TTM_PL_FLAG_NO_EVICT;
 
-#if (LINUX_VERSION_CODE < KERNEL_VERSION(4, 16, 0)) && !defined(RHEL_76) \
+#if (RTLNX_VER_MAX(4,16,0)) && !defined(RHEL_76) \
   && !defined(OPENSUSE_151) && !defined(OPENSUSE_125)
         ret = ttm_bo_validate(&bo->bo, &bo->placement, false, false);