Changeset 88405 in vbox for trunk/src

Timestamp:

Apr 7, 2021 5:33:33 PM (4 years ago)

Author:

vboxsync

Message:

additions: linux: vboxvideo: fix build for RH 8.4 kernel: bugref:4567.

This issue was also mentioned in public ticket #20289.

Location:

trunk/src/VBox/Additions/linux/drm

Files:

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

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

@@ -263 +263 @@
 };
 
-#if RTLNX_VER_MIN(5,9,0)
+#if RTLNX_VER_MIN(5,9,0) || RTLNX_RHEL_MIN(8,4)
 static void
 #else
@@ -287 +287 @@
         mutex_unlock(&vbox->hw_mutex);
 
-#if RTLNX_VER_MAX(5,9,0)
+#if RTLNX_VER_MAX(5,9,0) && !RTLNX_RHEL_MAJ_PREREQ(8,4)
         return 0;
 #endif

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

@@ -411 +411 @@
                         vbox_bo_unreserve(bo);
                 }
-#if RTLNX_VER_MIN(5,9,0)
+#if RTLNX_VER_MIN(5,9,0) || RTLNX_RHEL_MIN(8,4)
                 drm_gem_object_put(afb->obj);
 #else
@@ -444 +444 @@
         drm_fb_helper_prepare(dev, &fbdev->helper, &vbox_fb_helper_funcs);
 #endif
-#if RTLNX_VER_MIN(5,7,0)
+#if RTLNX_VER_MIN(5,7,0) || RTLNX_RHEL_MIN(8,4)
         ret = drm_fb_helper_init(dev, &fbdev->helper);
 #elif RTLNX_VER_MIN(4,11,0) || RTLNX_RHEL_MAJ_PREREQ(7,5)
@@ -456 +456 @@
                 return ret;
 
-#if RTLNX_VER_MAX(5,7,0)
+#if RTLNX_VER_MAX(5,7,0) && !RTLNX_RHEL_MAJ_PREREQ(8,4)
         ret = drm_fb_helper_single_add_all_connectors(&fbdev->helper);
         if (ret)

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

@@ -47 +47 @@
 
         if (vbox_fb->obj)
-#if RTLNX_VER_MIN(5,9,0)
+#if RTLNX_VER_MIN(5,9,0) || RTLNX_RHEL_MIN(8,4)
                 drm_gem_object_put(vbox_fb->obj);
 #else
@@ -226 +226 @@
         kfree(vbox_fb);
 err_unref_obj:
-#if RTLNX_VER_MIN(5,9,0)
+#if RTLNX_VER_MIN(5,9,0) || RTLNX_RHEL_MIN(8,4)
         drm_gem_object_put(obj);
 #else
@@ -597 +597 @@
 
         ret = drm_gem_handle_create(file, gobj, &handle);
-#if RTLNX_VER_MIN(5,9,0)
+#if RTLNX_VER_MIN(5,9,0) || RTLNX_RHEL_MIN(8,4)
         drm_gem_object_put(gobj);
 #else

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

@@ -889 +889 @@
         vbox_bo_unreserve(bo);
 out_unref_obj:
-#if RTLNX_VER_MIN(5,9,0)
+#if RTLNX_VER_MIN(5,9,0) || RTLNX_RHEL_MIN(8,4)
         drm_gem_object_put(obj);
 #else

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

@@ -579 +579 @@
 static inline u64 vbox_bo_gpu_offset(struct vbox_bo *bo)
 {
-#if RTLNX_VER_MIN(5,9,0)
+#if RTLNX_VER_MIN(5,9,0) || RTLNX_RHEL_MIN(8,4)
         return bo->bo.mem.start << PAGE_SHIFT;
 #else