Changeset 85706 in vbox for trunk/src/VBox/Additions/linux/drm

Timestamp:

Aug 11, 2020 7:23:49 PM (5 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

139846

Message:

Add/linux/vboxvideo: Use RTLNX_SUSE_* macros, eliminating the (misnamed) OPENSUSE_XXY ones.

Location:

trunk/src/VBox/Additions/linux/drm

Files:

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

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

@@ -327 +327 @@
 #if RTLNX_VER_MIN(3,18,0) || RTLNX_RHEL_MAJ_PREREQ(7,2)
 # if RTLNX_VER_MAX(4,14,0) && !RTLNX_RHEL_MAJ_PREREQ(7,5) \
-  && !defined(OPENSUSE_151) && !defined(OPENSUSE_125)
+  && !RTLNX_SUSE_MAJ_PREREQ(15,1) && !RTLNX_SUSE_MAJ_PREREQ(12,5)
         .set_busid = drm_pci_set_busid,
 # endif

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

@@ -136 +136 @@
 #include <linux/pci.h>
 
-#if defined(CONFIG_SUSE_VERSION)
-# if CONFIG_SUSE_VERSION == 15 && CONFIG_SUSE_PATCHLEVEL == 1
-#  define OPENSUSE_151
-# endif
-# if CONFIG_SUSE_VERSION == 12 && CONFIG_SUSE_PATCHLEVEL >= 5
-#  define OPENSUSE_125
-# endif
-#endif
 
 #if RTLNX_VER_MAX(3,14,0) || RTLNX_RHEL_MAJ_PREREQ(7,1)

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

@@ -606 +606 @@
 #endif
 
-#if RTLNX_VER_MAX(4,19,0) && !defined(OPENSUSE_151) && !defined(OPENSUSE_125) \
+#if RTLNX_VER_MAX(4,19,0) && !RTLNX_SUSE_MAJ_PREREQ(15,1) && !RTLNX_SUSE_MAJ_PREREQ(12,5) \
   && !RTLNX_RHEL_MAJ_PREREQ(7,7) && !RTLNX_RHEL_MAJ_PREREQ(8,1)
 static void ttm_bo_put(struct ttm_buffer_object *bo)

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

@@ -547 +547 @@
                 sum += edid[i];
         edid[EDID_SIZE - 1] = (0x100 - (sum & 0xFF)) & 0xFF;
-#if RTLNX_VER_MIN(4,19,0) || defined(OPENSUSE_151) || defined(OPENSUSE_125) \
+#if RTLNX_VER_MIN(4,19,0) || RTLNX_SUSE_MAJ_PREREQ(15,1) || RTLNX_SUSE_MAJ_PREREQ(12,5) \
   || RTLNX_RHEL_MAJ_PREREQ(7,7) || RTLNX_RHEL_MAJ_PREREQ(8,1)
         drm_connector_update_edid_property(connector, (struct edid *)edid);
@@ -723 +723 @@
 #endif
 
-#if RTLNX_VER_MIN(4,19,0) || defined(OPENSUSE_151) || defined(OPENSUSE_125) \
+#if RTLNX_VER_MIN(4,19,0) || RTLNX_SUSE_MAJ_PREREQ(15,1) || RTLNX_SUSE_MAJ_PREREQ(12,5) \
   || RTLNX_RHEL_MAJ_PREREQ(7,7) || RTLNX_RHEL_MAJ_PREREQ(8,1)
         drm_connector_attach_encoder(connector, encoder);

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

@@ -212 +212 @@
 
 #if RTLNX_VER_MAX(4,17,0) && !RTLNX_RHEL_MAJ_PREREQ(7,6) \
-  && !defined(OPENSUSE_151) && !defined(OPENSUSE_125)
+  && !RTLNX_SUSE_MAJ_PREREQ(15,1) && !RTLNX_SUSE_MAJ_PREREQ(12,5)
 static struct ttm_tt *vbox_ttm_tt_create(struct ttm_bo_device *bdev,
                                          unsigned long size,
@@ -230 +230 @@
         tt->func = &vbox_tt_backend_func;
 #if RTLNX_VER_MAX(4,17,0) && !RTLNX_RHEL_MAJ_PREREQ(7,6) \
-  && !defined(OPENSUSE_151) && !defined(OPENSUSE_125)
+  && !RTLNX_SUSE_MAJ_PREREQ(15,1) && !RTLNX_SUSE_MAJ_PREREQ(12,5)
         if (ttm_tt_init(tt, bdev, size, page_flags, dummy_read_page)) {
 #else
@@ -244 +244 @@
 #if RTLNX_VER_MAX(4,17,0)
 # if (RTLNX_VER_MAX(4,16,0)) && !RTLNX_RHEL_MAJ_PREREQ(7,6) \
-  && !defined(OPENSUSE_151) && !defined(OPENSUSE_125)
+  && !RTLNX_SUSE_MAJ_PREREQ(15,1) && !RTLNX_SUSE_MAJ_PREREQ(12,5)
 static int vbox_ttm_tt_populate(struct ttm_tt *ttm)
 {
@@ -279 +279 @@
 #if RTLNX_VER_MIN(4,12,0) || RTLNX_RHEL_MAJ_PREREQ(7,5)
 # if (RTLNX_VER_MAX(4,16,0)) && !RTLNX_RHEL_MAJ_PREREQ(7,6) \
-  && !defined(OPENSUSE_151) && !defined(OPENSUSE_125)
+  && !RTLNX_SUSE_MAJ_PREREQ(15,1) && !RTLNX_SUSE_MAJ_PREREQ(12,5)
         .io_mem_pfn = ttm_bo_default_io_mem_pfn,
 # endif
@@ -427 +427 @@
                           ttm_bo_type_device, &vboxbo->placement,
 #if RTLNX_VER_MAX(4,17,0) && !RTLNX_RHEL_MAJ_PREREQ(7,6) \
-  && !defined(OPENSUSE_151) && !defined(OPENSUSE_125)
+  && !RTLNX_SUSE_MAJ_PREREQ(15,1) && !RTLNX_SUSE_MAJ_PREREQ(12,5)
                           align >> PAGE_SHIFT, false, NULL, acc_size,
 #else
@@ -457 +457 @@
 {
 #if (RTLNX_VER_MIN(4,16,0)) || RTLNX_RHEL_MAJ_PREREQ(7,6) \
-  || defined(OPENSUSE_151) || defined(OPENSUSE_125)
+  || RTLNX_SUSE_MAJ_PREREQ(15,1) || RTLNX_SUSE_MAJ_PREREQ(12,5)
         struct ttm_operation_ctx ctx = { false, false };
 #endif
@@ -476 +476 @@
 
 #if (RTLNX_VER_MAX(4,16,0)) && !RTLNX_RHEL_MAJ_PREREQ(7,6) \
-  && !defined(OPENSUSE_151) && !defined(OPENSUSE_125)
+  && !RTLNX_SUSE_MAJ_PREREQ(15,1) && !RTLNX_SUSE_MAJ_PREREQ(12,5)
         ret = ttm_bo_validate(&bo->bo, &bo->placement, false, false);
 #else
@@ -495 +495 @@
 {
 #if (RTLNX_VER_MIN(4,16,0)) || RTLNX_RHEL_MAJ_PREREQ(7,6) \
-  || defined(OPENSUSE_151) || defined(OPENSUSE_125)
+  || RTLNX_SUSE_MAJ_PREREQ(15,1) || RTLNX_SUSE_MAJ_PREREQ(12,5)
         struct ttm_operation_ctx ctx = { false, false };
 #endif
@@ -512 +512 @@
 
 #if (RTLNX_VER_MAX(4,16,0)) && !RTLNX_RHEL_MAJ_PREREQ(7,6) \
-  && !defined(OPENSUSE_151) && !defined(OPENSUSE_125)
+  && !RTLNX_SUSE_MAJ_PREREQ(15,1) && !RTLNX_SUSE_MAJ_PREREQ(12,5)
         ret = ttm_bo_validate(&bo->bo, &bo->placement, false, false);
 #else
@@ -531 +531 @@
 {
 #if (RTLNX_VER_MIN(4,16,0)) || RTLNX_RHEL_MAJ_PREREQ(7,6) \
-  || defined(OPENSUSE_151) || defined(OPENSUSE_125)
+  || RTLNX_SUSE_MAJ_PREREQ(15,1) || RTLNX_SUSE_MAJ_PREREQ(12,5)
         struct ttm_operation_ctx ctx = { false, false };
 #endif
@@ -553 +553 @@
 
 #if (RTLNX_VER_MAX(4,16,0)) && !RTLNX_RHEL_MAJ_PREREQ(7,6) \
-  && !defined(OPENSUSE_151) && !defined(OPENSUSE_125)
+  && !RTLNX_SUSE_MAJ_PREREQ(15,1) && !RTLNX_SUSE_MAJ_PREREQ(12,5)
         ret = ttm_bo_validate(&bo->bo, &bo->placement, false, false);
 #else