Changeset 85705 in vbox for trunk/src/VBox/Additions/linux/drm/vbox_mode.c

Timestamp:

Aug 11, 2020 7:17:09 PM (4 years ago)

Author:

vboxsync

Message:

Add/linux/vboxvideo: Use RTLNX_RHEL_* macros, eliminating the RHEL_XY ones.

File:

• trunk/src/VBox/Additions/linux/drm/vbox_mode.c (modified) (16 diffs)

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

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