Changeset 93416 in vbox

Timestamp:

Jan 24, 2022 4:26:56 PM (3 years ago)

Author:

vboxsync

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

149518

Message:

Linux Additions: vboxvideo: initial support for kernel 5.17-rc1, bugref:10190.

File:

• trunk/src/VBox/Additions/linux/drm/vbox_drv.c (modified) (3 diffs)

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

@@ -51 +51 @@
 #include "revision-generated.h"
 
+/** Detect whether kernel mode setting is OFF. */
+#if defined(CONFIG_VGA_CONSOLE)
+# if RTLNX_VER_MIN(5,17,0)
+#  define VBOX_VIDEO_NOMODESET() drm_firmware_drivers_only() && vbox_modeset == -1
+# elif RTLNX_VER_MIN(4,7,0)
+#  define VBOX_VIDEO_NOMODESET() vgacon_text_force() && vbox_modeset == -1
+# else /* < 4.7.0 */
+# define VBOX_VIDEO_NOMODESET() 0
+# endif /* < 4.7.0 */
+#else /* !CONFIG_VGA_CONSOLE */
+# define VBOX_VIDEO_NOMODESET() 0
+#endif /* !CONFIG_VGA_CONSOLE */
+
 static int vbox_modeset = -1;
 
@@ -399 +412 @@
 {
         printk("vboxvideo: loading version " VBOX_VERSION_STRING " r" __stringify(VBOX_SVN_REV) "\n");
-#if defined(CONFIG_VGA_CONSOLE) || RTLNX_VER_MIN(4,7,0)
-        if (vgacon_text_force() && vbox_modeset == -1)
+        if (VBOX_VIDEO_NOMODESET())
         {
                 printk("vboxvideo: kernel is running with *nomodeset* parameter,\n");
@@ -407 +419 @@
                 return -EINVAL;
         }
-#endif
 
         if (vbox_modeset == 0)