Changeset 94330 in vbox for trunk

Timestamp:

Mar 22, 2022 7:23:04 PM (3 years ago)

Author:

vboxsync

Message:

Additions: Linux: vboxvideo: Introduce initial support for RHEL 8.6 kernels (another attempt to exclude 8.99), ​​bugref:4567.

Location:

trunk/src/VBox/Additions/linux/drm

Files:

• vbox_drv.c (modified) (3 diffs)
• vbox_drv.h (modified) (1 diff)
• vbox_fb.c (modified) (1 diff)
• vbox_main.c (modified) (2 diffs)
• vbox_mode.c (modified) (1 diff)
• vbox_ttm.c (modified) (7 diffs)

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

@@ -44 +44 @@
 #endif
 
-#if RTLNX_VER_MIN(5,14,0) || RTLNX_RHEL_MAJ_PREREQ(8,6)
+#if RTLNX_VER_MIN(5,14,0) || RTLNX_RHEL_RANGE(8,6, 8,99)
 # include <drm/drm_aperture.h>
 #endif
@@ -83 +83 @@
         int ret = 0;
 
-# if RTLNX_VER_MIN(5,14,0) || RTLNX_RHEL_MAJ_PREREQ(8,6)
+# if RTLNX_VER_MIN(5,14,0) || RTLNX_RHEL_RANGE(8,6, 8,99)
 #  if RTLNX_VER_MIN(5,15,0)
         ret = drm_aperture_remove_conflicting_pci_framebuffers(pdev, &driver);
@@ -101 +101 @@
                 goto err_drv_alloc;
         }
-# if RTLNX_VER_MAX(5,14,0) && !RTLNX_RHEL_MAJ_PREREQ(8,6)
+# if RTLNX_VER_MAX(5,14,0) && !RTLNX_RHEL_RANGE(8,6, 8,99)
         dev->pdev = pdev;
 # endif

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

@@ -233 +233 @@
  * transparently handles this change. Input argument is a pointer
  * to struct drm_device. */
-#if RTLNX_VER_MIN(5,14,0) || RTLNX_RHEL_MAJ_PREREQ(8,6)
+#if RTLNX_VER_MIN(5,14,0) || RTLNX_RHEL_RANGE(8,6, 8,99)
 # define VBOX_DRM_TO_PCI_DEV(_dev) to_pci_dev(_dev->dev)
 #else

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

@@ -302 +302 @@
         }
 
-#if RTLNX_VER_MIN(5,14,0) || RTLNX_RHEL_MAJ_PREREQ(8,6)
+#if RTLNX_VER_MIN(5,14,0) || RTLNX_RHEL_RANGE(8,6, 8,99)
         ret = ttm_bo_kmap(&bo->bo, 0, bo->bo.resource->num_pages, &bo->kmap);
 #elif RTLNX_VER_MIN(5,12,0) || RTLNX_RHEL_MAJ_PREREQ(8,5)

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

@@ -633 +633 @@
         struct vbox_bo *vbox_bo = gem_to_vbox_bo(obj);
 
-#if RTLNX_VER_MIN(5,14,0) || RTLNX_RHEL_MAJ_PREREQ(8,6)
+#if RTLNX_VER_MIN(5,14,0) || RTLNX_RHEL_RANGE(8,6, 8,99)
         /* Starting from kernel 5.14, there is a warning appears in dmesg
          * on attempt to desroy pinned buffer object. Make sure it is unpinned. */
@@ -685 +685 @@
         *offset = vbox_bo_mmap_offset(bo);
 
-#if RTLNX_VER_MIN(5,14,0) || RTLNX_RHEL_MAJ_PREREQ(8,6)
+#if RTLNX_VER_MIN(5,14,0) || RTLNX_RHEL_RANGE(8,6, 8,99)
         ret = drm_vma_node_allow(&bo->bo.base.vma_node, file);
         if (ret)

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

@@ -861 +861 @@
         dst = vbox->cursor_data;
 
-#if RTLNX_VER_MIN(5,14,0) || RTLNX_RHEL_MAJ_PREREQ(8,6)
+#if RTLNX_VER_MIN(5,14,0) || RTLNX_RHEL_RANGE(8,6, 8,99)
         ret = ttm_bo_kmap(&bo->bo, 0, bo->bo.resource->num_pages, &uobj_map);
 #elif RTLNX_VER_MIN(5,12,0) || RTLNX_RHEL_MAJ_PREREQ(8,5)

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

@@ -42 +42 @@
 #endif
 
-#if RTLNX_VER_MIN(5,14,0) || RTLNX_RHEL_MAJ_PREREQ(8,6)
+#if RTLNX_VER_MIN(5,14,0) || RTLNX_RHEL_RANGE(8,6, 8,99)
 # include <drm/ttm/ttm_range_manager.h>
 #endif
@@ -179 +179 @@
 }
 
-#if RTLNX_VER_MAX(5,14,0) && !RTLNX_RHEL_MAJ_PREREQ(8,6)
+#if RTLNX_VER_MAX(5,14,0) && !RTLNX_RHEL_RANGE(8,6, 8,99)
 static int vbox_bo_verify_access(struct ttm_buffer_object *bo,
                                  struct file *filp)
@@ -380 +380 @@
 #endif
         .evict_flags = vbox_bo_evict_flags,
-#if RTLNX_VER_MAX(5,14,0) && !RTLNX_RHEL_MAJ_PREREQ(8,6)
+#if RTLNX_VER_MAX(5,14,0) && !RTLNX_RHEL_RANGE(8,6, 8,99)
         .verify_access = vbox_bo_verify_access,
 #endif
@@ -569 +569 @@
         .free   = vbox_gem_free_object,
         .print_info = drm_gem_ttm_print_info,
-# if RTLNX_VER_MIN(5,14,0) || RTLNX_RHEL_MAJ_PREREQ(8,6)
+# if RTLNX_VER_MIN(5,14,0) || RTLNX_RHEL_RANGE(8,6, 8,99)
         .mmap = drm_gem_ttm_mmap,
 # endif
@@ -610 +610 @@
 #endif
 
-#if RTLNX_VER_MIN(5,14,0) || RTLNX_RHEL_MAJ_PREREQ(8,6)
+#if RTLNX_VER_MIN(5,14,0) || RTLNX_RHEL_RANGE(8,6, 8,99)
         /* Initialization of the following was removed from DRM stack
          * in 5.14, so we need to do it manually. */
@@ -654 +654 @@
 static inline u64 vbox_bo_gpu_offset(struct vbox_bo *bo)
 {
-#if RTLNX_VER_MIN(5,14,0) || RTLNX_RHEL_MAJ_PREREQ(8,6)
+#if RTLNX_VER_MIN(5,14,0) || RTLNX_RHEL_RANGE(8,6, 8,99)
         return bo->bo.resource->start << PAGE_SHIFT;
 #elif RTLNX_VER_MIN(5,9,0) || RTLNX_RHEL_MIN(8,4) || RTLNX_SUSE_MAJ_PREREQ(15,3)
@@ -803 +803 @@
         vbox = file_priv->minor->dev->dev_private;
 
-#if RTLNX_VER_MIN(5,14,0) || RTLNX_RHEL_MAJ_PREREQ(8,6)
+#if RTLNX_VER_MIN(5,14,0) || RTLNX_RHEL_RANGE(8,6, 8,99)
         if (drm_dev_is_unplugged(file_priv->minor->dev))
                 return -ENODEV;