Changeset 75402 in vbox

Timestamp:

Nov 12, 2018 4:50:53 PM (6 years ago)

Author:

vboxsync

Message:

Addiitons/linux/vboxvideo: make vboxvideo work with EL7.6 standard kernel.
bugref:4567: Linux kernel driver maintenance.
Contributed by Robert Conde. Many thanks!

Location:

trunk/src/VBox/Additions/linux/drm

Files:

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

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

@@ -47 +47 @@
 
 #if defined(RHEL_MAJOR) && defined(RHEL_MINOR)
+# if RHEL_MAJOR == 7 && RHEL_MINOR >= 6
+#  define RHEL_76
+# endif
 # if RHEL_MAJOR == 7 && RHEL_MINOR >= 5
 #  define RHEL_75

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

@@ -357 +357 @@
         if (enc_id)
 #if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 15, 0) || \
-    (defined(CONFIG_SUSE_VERSION) && CONFIG_SUSE_VERSION == 15)
+    (defined(CONFIG_SUSE_VERSION) && CONFIG_SUSE_VERSION == 15) || \
+                defined(RHEL_76)
                 return drm_encoder_find(connector->dev, NULL, enc_id);
 #else

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

@@ -205 +205 @@
 };
 
-#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 17, 0)
+#if (LINUX_VERSION_CODE < KERNEL_VERSION(4, 17, 0)) && !defined(RHEL_76)
 static struct ttm_tt *vbox_ttm_tt_create(struct ttm_bo_device *bdev,
                                          unsigned long size,
@@ -222 +222 @@
 
         tt->func = &vbox_tt_backend_func;
-#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 17, 0)
+#if (LINUX_VERSION_CODE < KERNEL_VERSION(4, 17, 0)) && !defined(RHEL_76)
         if (ttm_tt_init(tt, bdev, size, page_flags, dummy_read_page)) {
 #else
@@ -235 +235 @@
 
 #if LINUX_VERSION_CODE < KERNEL_VERSION(4, 17, 0)
-# if LINUX_VERSION_CODE < KERNEL_VERSION(4, 16, 0)
+# if (LINUX_VERSION_CODE < KERNEL_VERSION(4, 16, 0)) && !defined(RHEL_76)
 static int vbox_ttm_tt_populate(struct ttm_tt *ttm)
 {
@@ -269 +269 @@
         .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)
+# if (LINUX_VERSION_CODE < KERNEL_VERSION(4, 16, 0)) && !defined(RHEL_76)
         .io_mem_pfn = ttm_bo_default_io_mem_pfn,
 # endif
@@ -408 +408 @@
                           align >> PAGE_SHIFT, false, acc_size,
 #endif
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 18, 0) || defined(RHEL_72)
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 18, 0) || defined(RHEL_72)) && !defined(RHEL_76) 
                           NULL, NULL, vbox_bo_ttm_destroy);
 #else
@@ -432 +432 @@
 int vbox_bo_pin(struct vbox_bo *bo, u32 pl_flag, u64 *gpu_addr)
 {
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 16, 0)
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4, 16, 0)) || defined(RHEL_76)
         struct ttm_operation_ctx ctx = { false, false };
 #endif
@@ -450 +450 @@
                 PLACEMENT_FLAGS(bo->placements[i]) |= TTM_PL_FLAG_NO_EVICT;
 
-#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 16, 0)
+#if (LINUX_VERSION_CODE < KERNEL_VERSION(4, 16, 0)) && !defined(RHEL_76)
         ret = ttm_bo_validate(&bo->bo, &bo->placement, false, false);
 #else
@@ -468 +468 @@
 int vbox_bo_unpin(struct vbox_bo *bo)
 {
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 16, 0)
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4, 16, 0)) || defined(RHEL_76)
         struct ttm_operation_ctx ctx = { false, false };
 #endif
@@ -484 +484 @@
                 PLACEMENT_FLAGS(bo->placements[i]) &= ~TTM_PL_FLAG_NO_EVICT;
 
-#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 16, 0)
+#if (LINUX_VERSION_CODE < KERNEL_VERSION(4, 16, 0)) && !defined(RHEL_76)
         ret = ttm_bo_validate(&bo->bo, &bo->placement, false, false);
 #else
@@ -502 +502 @@
 int vbox_bo_push_sysram(struct vbox_bo *bo)
 {
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 16, 0)
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4, 16, 0)) || defined(RHEL_76)
         struct ttm_operation_ctx ctx = { false, false };
 #endif
@@ -523 +523 @@
                 PLACEMENT_FLAGS(bo->placements[i]) |= TTM_PL_FLAG_NO_EVICT;
 
-#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 16, 0)
+#if (LINUX_VERSION_CODE < KERNEL_VERSION(4, 16, 0)) && !defined(RHEL_76)
         ret = ttm_bo_validate(&bo->bo, &bo->placement, false, false);
 #else