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

Timestamp:

Jul 19, 2023 2:35:39 PM (19 months ago)

Author:

vboxsync

Message:

Additions: Linux: vboxvideo: additional fixes for RHEL 9.3 kernel, bugref:10381.

This commit accumulates fixes for REHEL 9.3 kernel which needed
after it received DRM backports from vanilla kernel 5.19, 6.2 and 6.3.
Also fixes lost-in-time mutex_lock in vbox_crtc_page_flip.

Location:

trunk/src/VBox/Additions/linux/drm

Files:

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

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

@@ -173 +173 @@
 #endif
 
-#if RTLNX_VER_MIN(6,3,0)
+#if RTLNX_VER_MIN(6,3,0) || RTLNX_RHEL_MAJ_PREREQ(9,3)
 # include <drm/ttm/ttm_bo.h>
 #else
@@ -250 +250 @@
  * now represents number of bytes. This macro handles this change. Input
  * argument is a pointer to struct ttm_resource. */
-#if RTLNX_VER_MIN(6,2,0)
+#if RTLNX_VER_MIN(6,2,0) || RTLNX_RHEL_MAJ_PREREQ(9,3)
 # define VBOX_BO_RESOURCE_NUM_PAGES(_resource) PFN_UP(_resource->size)
 #else

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

@@ -51 +51 @@
 #include <VBoxVideo.h>
 
-#if RTLNX_VER_MIN(6,2,0)
+#if RTLNX_VER_MIN(6,2,0) || RTLNX_RHEL_MAJ_PREREQ(9,3)
 # define VBOX_FBDEV_INFO(_helper) _helper.info
 #else
@@ -326 +326 @@
         }
 
-#if RTLNX_VER_MIN(6,2,0)
+#if RTLNX_VER_MIN(6,2,0) || RTLNX_RHEL_MAJ_PREREQ(9,3)
         info = drm_fb_helper_alloc_info(helper);
 #else
@@ -350 +350 @@
         info->fbops = &vboxfb_ops;
 
-#if RTLNX_VER_MAX(6,3,0)
+#if RTLNX_VER_MAX(6,3,0) && !RTLNX_RHEL_MAJ_PREREQ(9,3)
         /*
          * This seems to be done for safety checking that the framebuffer
@@ -379 +379 @@
 
 #ifdef CONFIG_FB_DEFERRED_IO
-# if RTLNX_VER_MIN(5,19,0) || RTLNX_RHEL_RANGE(8,8, 8,99)
+# if RTLNX_VER_MIN(5,19,0) || RTLNX_RHEL_RANGE(8,8, 8,99) || RTLNX_RHEL_MAJ_PREREQ(9,3)
         info->fix.smem_len = info->screen_size;
 # endif
@@ -416 +416 @@
 #endif
 
-#if RTLNX_VER_MIN(6,2,0)
+#if RTLNX_VER_MIN(6,2,0) || RTLNX_RHEL_MAJ_PREREQ(9,3)
         drm_fb_helper_unregister_info(&fbdev->helper);
 #else
@@ -464 +464 @@
         spin_lock_init(&fbdev->dirty_lock);
 
-#if RTLNX_VER_MIN(6,3,0)
+#if RTLNX_VER_MIN(6,3,0) || RTLNX_RHEL_MAJ_PREREQ(9,3)
         drm_fb_helper_prepare(dev, &fbdev->helper, 32, &vbox_fb_helper_funcs);
 #elif RTLNX_VER_MIN(3,17,0) || RTLNX_RHEL_MIN(7,2)
@@ -493 +493 @@
         drm_helper_disable_unused_functions(dev);
 
-#if RTLNX_VER_MIN(6,3,0)
+#if RTLNX_VER_MIN(6,3,0) || RTLNX_RHEL_MAJ_PREREQ(9,3)
         ret = drm_fb_helper_initial_config(&fbdev->helper);
 #else
@@ -512 +512 @@
         struct fb_info *fbdev = VBOX_FBDEV_INFO(vbox->fbdev->helper);
 
-#if RTLNX_VER_MIN(6,3,0)
+#if RTLNX_VER_MIN(6,3,0) || RTLNX_RHEL_MAJ_PREREQ(9,3)
     fbdev->fix.smem_start =
 pci_resource_start(VBOX_DRM_TO_PCI_DEV(vbox->fbdev->helper.dev), 0) + gpu_addr;

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

@@ -37 +37 @@
 #include <drm/drm_crtc_helper.h>
 
-#if RTLNX_VER_MIN(6,3,0)
+#if RTLNX_VER_MIN(6,3,0) || RTLNX_RHEL_MAJ_PREREQ(9,3)
 # include <drm/drm_modeset_helper.h>
 #endif

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

@@ -40 +40 @@
 #include <linux/export.h>
 #include <drm/drm_crtc_helper.h>
-#if RTLNX_VER_MIN(6,3,0)
+#if RTLNX_VER_MIN(6,3,0) || RTLNX_RHEL_MAJ_PREREQ(9,3)
 # include <drm/drm_modeset_helper_vtables.h>
 # include <drm/drm_modeset_helper.h>
@@ -317 +317 @@
                 return rc;
 
+        mutex_lock(&vbox->hw_mutex);
         vbox_do_modeset(crtc, &crtc->mode);
         mutex_unlock(&vbox->hw_mutex);

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

@@ -35 +35 @@
 #include "vbox_drv.h"
 
-#if RTLNX_VER_MIN(6,3,0)
+#if RTLNX_VER_MIN(6,3,0) || RTLNX_RHEL_MAJ_PREREQ(9,3)
 # include <drm/ttm/ttm_tt.h>
 #endif
@@ -629 +629 @@
 #endif
 
-#if RTLNX_VER_MIN(6,1,0)
+#if RTLNX_VER_MIN(6,1,0) || RTLNX_RHEL_MAJ_PREREQ(9,3)
         ret = ttm_bo_init_validate(&vbox->ttm.bdev, &vboxbo->bo,
 #else