Changeset 98455 in vbox for trunk/src/VBox

Timestamp:

Feb 2, 2023 7:50:15 PM (23 months ago)

Author:

vboxsync

Message:

Additions: Linux: vboxvideo: Additional build fixes for RHEL 9.1 and 9.2 kernels, bugref:10190, bugref:10237, bugref:10279, ticketref:21446, ticketref:21450.

Location:

trunk/src/VBox/Additions/linux/drm

Files:

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

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

@@ -53 +53 @@
 /** Detect whether kernel mode setting is OFF. */
 #if defined(CONFIG_VGA_CONSOLE)
-# if RTLNX_VER_MIN(5,17,0) || RTLNX_RHEL_RANGE(8,7, 8,99)
+# if RTLNX_VER_MIN(5,17,0) || RTLNX_RHEL_RANGE(8,7, 8,99) || RTLNX_RHEL_MIN(9,1)
 #  define VBOX_VIDEO_NOMODESET() drm_firmware_drivers_only() && vbox_modeset == -1
 # elif RTLNX_VER_MIN(4,7,0)

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

@@ -186 +186 @@
 #endif
 
-#if RTLNX_VER_MIN(6,0,0)
+#if RTLNX_VER_MIN(6,0,0) || RTLNX_RHEL_MAJ_PREREQ(9,2)
 # include <drm/drm_framebuffer.h>
 #endif

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

@@ -47 +47 @@
 #endif
 
-#if RTLNX_VER_MIN(6,0,0)
+#if RTLNX_VER_MIN(6,0,0) || RTLNX_RHEL_MAJ_PREREQ(9,2)
 # include <drm/drm_edid.h>
 #endif

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

@@ -317 +317 @@
         tt->func = &vbox_tt_backend_func;
 #endif
-#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)
+#if RTLNX_VER_MIN(5,19,0) || RTLNX_RHEL_MAJ_PREREQ(9,2)
+        if (ttm_tt_init(tt, bo, page_flags, ttm_write_combined, 0)) {
+#elif RTLNX_VER_MIN(5,11,0) || RTLNX_RHEL_RANGE(8,5, 8,99)
+        if (ttm_tt_init(tt, bo, page_flags, ttm_write_combined)) {
+#elif RTLNX_VER_MIN(4,17,0) || RTLNX_RHEL_MAJ_PREREQ(7,6) || RTLNX_SUSE_MAJ_PREREQ(15,1) || RTLNX_SUSE_MAJ_PREREQ(12,5)
+        if (ttm_tt_init(tt, bo, page_flags)) {
+#else
         if (ttm_tt_init(tt, bdev, size, page_flags, dummy_read_page)) {
-#elif RTLNX_VER_MAX(5,11,0) && !RTLNX_RHEL_RANGE(8,5, 8,99)
-        if (ttm_tt_init(tt, bo, page_flags)) {
-#elif RTLNX_VER_MAX(5,19,0)
-        if (ttm_tt_init(tt, bo, page_flags, ttm_write_combined)) {
-#else
-        if (ttm_tt_init(tt, bo, page_flags, ttm_write_combined, 0)) {
-#endif
+#endif
+
                 kfree(tt);
                 return NULL;