Changeset 63916 in vbox for trunk/src

Timestamp:

Sep 20, 2016 8:26:22 PM (8 years ago)

Author:

vboxsync

Message:

bugref:8087: Additions/x11: support non-root X server: remove protection against loading while the X server is running which required that all virtual consoles be in text mode. We hopefully no longer need this, as the driver is only ever auto-loaded at boot time (particularly not when the Additions are installed), and it prevented the drivers from working in combination with EFI and a boot splash screen, as this also set the virtual console to graphics mode.

Location:

trunk/src/VBox/Additions/linux

Files:

• drm/vbox_drv.c (modified) (1 diff)
• installer/vboxadd-x11.sh (modified) (1 diff)

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

@@ -318 +318 @@
         return -EINVAL;
 
-    /* Do not load if any of the virtual consoles is in graphics mode to be
-     * sure that we do not pick a fight with a user-mode driver or VESA. */
-    for (i = 0; i < MAX_NR_CONSOLES - 1; ++i)
-        if (vc_cons[i].d && vc_cons[i].d->vc_mode == KD_GRAPHICS)
-            return -EINVAL;
-
     return drm_pci_init(&driver, &vbox_pci_driver);
 }

trunk/src/VBox/Additions/linux/installer/vboxadd-x11.sh

@@ -339 +339 @@
         if test -f /etc/modprobe.d/blacklist-vboxvideo.conf; then
             rm -f /etc/modprobe.d/blacklist-vboxvideo.conf
-            ${MODPROBE} vboxvideo
+            ps -Af | grep -q '[X]org' || ${MODPROBE} vboxvideo
         fi
         ;;