Changeset 94329 in vbox

Timestamp:

Mar 22, 2022 7:08:26 PM (3 years ago)

Author:

vboxsync

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

150632

Message:

Additions: Linux: vboxvideo: Introduce initial support for RHEL 8.6 kernels (excluding 8.99), ​bugref:4567.

Location:

trunk/src/VBox/Additions/linux/drm

Files:

• vbox_drv.h (modified) (2 diffs)
• vbox_ttm.c (modified) (12 diffs)

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

@@ -176 +176 @@
 #include <drm/ttm/ttm_bo_driver.h>
 #include <drm/ttm/ttm_placement.h>
-#if RTLNX_VER_MAX(5,13,0) && !RTLNX_RHEL_MAJ_PREREQ(8,6)
+#if RTLNX_VER_MAX(5,13,0) && !RTLNX_RHEL_RANGE(8,6, 8,99)
 # include <drm/ttm/ttm_memory.h>
 #endif
@@ -277 +277 @@
                 struct ttm_bo_global_ref bo_global_ref;
 #endif
-#if RTLNX_VER_MIN(5,13,0) || RTLNX_RHEL_MAJ_PREREQ(8,6)
+#if RTLNX_VER_MIN(5,13,0) || RTLNX_RHEL_RANGE(8,6, 8,99)
                 struct ttm_device bdev;
 #else

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

@@ -53 +53 @@
 
 
-#if RTLNX_VER_MIN(5,13,0) || RTLNX_RHEL_MAJ_PREREQ(8,6)
+#if RTLNX_VER_MIN(5,13,0) || RTLNX_RHEL_RANGE(8,6, 8,99)
 static inline struct vbox_private *vbox_bdev(struct ttm_device *bd)
 #else
@@ -216 +216 @@
 }
 #else
-# if RTLNX_VER_MAX(5,13,0) && !RTLNX_RHEL_MAJ_PREREQ(8,6)
+# if RTLNX_VER_MAX(5,13,0) && !RTLNX_RHEL_RANGE(8,6, 8,99)
 static int vbox_ttm_io_mem_reserve(struct ttm_bo_device *bdev,
                                    struct ttm_resource *mem)
@@ -257 +257 @@
 
 
-#if RTLNX_VER_MIN(5,13,0) || RTLNX_RHEL_MAJ_PREREQ(8,6)
+#if RTLNX_VER_MIN(5,13,0) || RTLNX_RHEL_RANGE(8,6, 8,99)
 static void vbox_ttm_io_mem_free(struct ttm_device *bdev,
                                  struct ttm_resource *mem)
@@ -274 +274 @@
 #endif
 
-#if RTLNX_VER_MIN(5,13,0) || RTLNX_RHEL_MAJ_PREREQ(8,6)
+#if RTLNX_VER_MIN(5,13,0) || RTLNX_RHEL_RANGE(8,6, 8,99)
 static void vbox_ttm_tt_destroy(struct ttm_device *bdev, struct ttm_tt *tt)
 {
@@ -360 +360 @@
 #endif
 
-#if RTLNX_VER_MIN(5,13,0) || RTLNX_RHEL_MAJ_PREREQ(8,6)
+#if RTLNX_VER_MIN(5,13,0) || RTLNX_RHEL_RANGE(8,6, 8,99)
 static struct ttm_device_funcs vbox_bo_driver = {
 #else /* < 5.13.0 */
@@ -403 +403 @@
         int ret;
         struct drm_device *dev = vbox->dev;
-#if RTLNX_VER_MIN(5,13,0) || RTLNX_RHEL_MAJ_PREREQ(8,6)
+#if RTLNX_VER_MIN(5,13,0) || RTLNX_RHEL_RANGE(8,6, 8,99)
         struct ttm_device *bdev = &vbox->ttm.bdev;
 #else
@@ -414 +414 @@
                 return ret;
 #endif
-#if RTLNX_VER_MIN(5,13,0) || RTLNX_RHEL_MAJ_PREREQ(8,6)
+#if RTLNX_VER_MIN(5,13,0) || RTLNX_RHEL_RANGE(8,6, 8,99)
         ret = ttm_device_init(&vbox->ttm.bdev,
 #else
@@ -470 +470 @@
 
 err_device_release:
-#if RTLNX_VER_MIN(5,13,0) || RTLNX_RHEL_MAJ_PREREQ(8,6)
+#if RTLNX_VER_MIN(5,13,0) || RTLNX_RHEL_RANGE(8,6, 8,99)
         ttm_device_fini(&vbox->ttm.bdev);
 #else
@@ -491 +491 @@
         arch_phys_wc_del(vbox->fb_mtrr);
 #endif
-#if RTLNX_VER_MIN(5,13,0) || RTLNX_RHEL_MAJ_PREREQ(8,6)
+#if RTLNX_VER_MIN(5,13,0) || RTLNX_RHEL_RANGE(8,6, 8,99)
         ttm_device_fini(&vbox->ttm.bdev);
 #else
@@ -580 +580 @@
         struct vbox_private *vbox = dev->dev_private;
         struct vbox_bo *vboxbo;
-#if RTLNX_VER_MAX(5,13,0) && !RTLNX_RHEL_MAJ_PREREQ(8,6)
+#if RTLNX_VER_MAX(5,13,0) && !RTLNX_RHEL_RANGE(8,6, 8,99)
         size_t acc_size;
 #endif
@@ -605 +605 @@
         vbox_ttm_placement(vboxbo, VBOX_MEM_TYPE_VRAM | VBOX_MEM_TYPE_SYSTEM);
 
-#if RTLNX_VER_MAX(5,13,0) && !RTLNX_RHEL_MAJ_PREREQ(8,6)
+#if RTLNX_VER_MAX(5,13,0) && !RTLNX_RHEL_RANGE(8,6, 8,99)
         acc_size = ttm_bo_dma_acc_size(&vbox->ttm.bdev, size,
                                        sizeof(struct vbox_bo));
@@ -625 +625 @@
 #if RTLNX_VER_MAX(4,17,0) && !RTLNX_RHEL_MAJ_PREREQ(7,6) && !RTLNX_SUSE_MAJ_PREREQ(15,1) && !RTLNX_SUSE_MAJ_PREREQ(12,5)
                           align >> PAGE_SHIFT, false, NULL, acc_size,
-#elif RTLNX_VER_MAX(5,13,0) && !RTLNX_RHEL_MAJ_PREREQ(8,6) /* < 5.13.0, < RHEL(8.6) */
+#elif RTLNX_VER_MAX(5,13,0) && !RTLNX_RHEL_RANGE(8,6, 8,99) /* < 5.13.0, < RHEL(8.6, 8.99) */
                           align >> PAGE_SHIFT, false, acc_size,
 #else /* > 5.13.0 */