Changeset 79025 in vbox for trunk/src/VBox/Additions/linux

Timestamp:

Jun 6, 2019 2:33:47 PM (6 years ago)

Author:

vboxsync

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

131177

Message:

Linux/host and guest drivers: support more openSUSE 15.0 and 15.1 kernels.

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) (12 diffs)

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

@@ -323 +323 @@
         .master_drop = vbox_master_drop,
 #if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 18, 0) || defined(RHEL_73)
-# if LINUX_VERSION_CODE < KERNEL_VERSION(4, 14, 0) && !defined(RHEL_75)
+# if LINUX_VERSION_CODE < KERNEL_VERSION(4, 14, 0) && !defined(RHEL_75) \
+  && !defined(OPENSUSE_151)
         .set_busid = drm_pci_set_busid,
 # endif

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

@@ -71 +71 @@
 # if RHEL_MAJOR == 7 && RHEL_MINOR >= 0
 #  define RHEL_70
+# endif
+#endif
+
+#if defined(CONFIG_SUSE_VERSION)
+# if CONFIG_SUSE_VERSION == 15 && CONFIG_SUSE_PATCHLEVEL == 1
+#  define OPENSUSE_151
 # endif
 #endif

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

@@ -606 +606 @@
 #endif
 
-#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 19, 0)
+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 19, 0) && !defined(OPENSUSE_151)
 static void ttm_bo_put(struct ttm_buffer_object *bo)
 {

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

@@ -501 +501 @@
                 sum += edid[i];
         edid[EDID_SIZE - 1] = (0x100 - (sum & 0xFF)) & 0xFF;
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 19, 0)
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 19, 0) || defined(OPENSUSE_151)
         drm_connector_update_edid_property(connector, (struct edid *)edid);
 #else
@@ -676 +676 @@
 #endif
 
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 19, 0)
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 19, 0) || defined(OPENSUSE_151)
         drm_connector_attach_encoder(connector, encoder);
 #else

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

@@ -211 +211 @@
 };
 
-#if (LINUX_VERSION_CODE < KERNEL_VERSION(4, 17, 0)) && !defined(RHEL_76)
+#if (LINUX_VERSION_CODE < KERNEL_VERSION(4, 17, 0)) && !defined(RHEL_76) \
+  && !defined(OPENSUSE_151)
 static struct ttm_tt *vbox_ttm_tt_create(struct ttm_bo_device *bdev,
                                          unsigned long size,
@@ -228 +229 @@
 
         tt->func = &vbox_tt_backend_func;
-#if (LINUX_VERSION_CODE < KERNEL_VERSION(4, 17, 0)) && !defined(RHEL_76)
+#if (LINUX_VERSION_CODE < KERNEL_VERSION(4, 17, 0)) && !defined(RHEL_76) \
+  && !defined(OPENSUSE_151)
         if (ttm_tt_init(tt, bdev, size, page_flags, dummy_read_page)) {
 #else
@@ -241 +243 @@
 
 #if LINUX_VERSION_CODE < KERNEL_VERSION(4, 17, 0)
-# if (LINUX_VERSION_CODE < KERNEL_VERSION(4, 16, 0)) && !defined(RHEL_76)
+# if (LINUX_VERSION_CODE < KERNEL_VERSION(4, 16, 0)) && !defined(RHEL_76) \
+  && !defined(OPENSUSE_151)
 static int vbox_ttm_tt_populate(struct ttm_tt *ttm)
 {
@@ -275 +278 @@
         .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 (LINUX_VERSION_CODE < KERNEL_VERSION(4, 16, 0)) && !defined(RHEL_76) \
+  && !defined(OPENSUSE_151)
         .io_mem_pfn = ttm_bo_default_io_mem_pfn,
 # endif
@@ -299 +303 @@
                 return ret;
 #endif
-
         ret = ttm_bo_device_init(&vbox->ttm.bdev,
 #if LINUX_VERSION_CODE < KERNEL_VERSION(5, 0, 0)
@@ -421 +424 @@
         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 LINUX_VERSION_CODE < KERNEL_VERSION(4, 17, 0) && !defined(RHEL_76) \
+  && !defined(OPENSUSE_151)
                           align >> PAGE_SHIFT, false, NULL, acc_size,
 #else
@@ -450 +454 @@
 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 (LINUX_VERSION_CODE >= KERNEL_VERSION(4, 16, 0)) || defined(RHEL_76) \
+  || defined(OPENSUSE_151)
         struct ttm_operation_ctx ctx = { false, false };
 #endif
@@ -468 +473 @@
                 PLACEMENT_FLAGS(bo->placements[i]) |= TTM_PL_FLAG_NO_EVICT;
 
-#if (LINUX_VERSION_CODE < KERNEL_VERSION(4, 16, 0)) && !defined(RHEL_76)
+#if (LINUX_VERSION_CODE < KERNEL_VERSION(4, 16, 0)) && !defined(RHEL_76) \
+  && !defined(OPENSUSE_151)
         ret = ttm_bo_validate(&bo->bo, &bo->placement, false, false);
 #else
@@ -486 +492 @@
 int vbox_bo_unpin(struct vbox_bo *bo)
 {
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4, 16, 0)) || defined(RHEL_76)
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4, 16, 0)) || defined(RHEL_76) \
+  || defined(OPENSUSE_151)
         struct ttm_operation_ctx ctx = { false, false };
 #endif
@@ -502 +509 @@
                 PLACEMENT_FLAGS(bo->placements[i]) &= ~TTM_PL_FLAG_NO_EVICT;
 
-#if (LINUX_VERSION_CODE < KERNEL_VERSION(4, 16, 0)) && !defined(RHEL_76)
+#if (LINUX_VERSION_CODE < KERNEL_VERSION(4, 16, 0)) && !defined(RHEL_76) \
+  && !defined(OPENSUSE_151)
         ret = ttm_bo_validate(&bo->bo, &bo->placement, false, false);
 #else
@@ -520 +528 @@
 int vbox_bo_push_sysram(struct vbox_bo *bo)
 {
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4, 16, 0)) || defined(RHEL_76)
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4, 16, 0)) || defined(RHEL_76) \
+  || defined(OPENSUSE_151)
         struct ttm_operation_ctx ctx = { false, false };
 #endif
@@ -541 +550 @@
                 PLACEMENT_FLAGS(bo->placements[i]) |= TTM_PL_FLAG_NO_EVICT;
 
-#if (LINUX_VERSION_CODE < KERNEL_VERSION(4, 16, 0)) && !defined(RHEL_76)
+#if (LINUX_VERSION_CODE < KERNEL_VERSION(4, 16, 0)) && !defined(RHEL_76) \
+  && !defined(OPENSUSE_151)
         ret = ttm_bo_validate(&bo->bo, &bo->placement, false, false);
 #else