Changeset 60317 in vbox for trunk/src/VBox

Timestamp:

Apr 4, 2016 8:41:07 PM (9 years ago)

Author:

vboxsync

Message:

bugref:8087: Additions/x11: support non-root X server: in the X.Org video driver, check whether the kernel driver is loaded in PCIProbe(), not in PreInit(). If PCIProbe() fails, the server continues to try the next driver (modesetting in this case), whereas if PreInit() fails it aborts altogether. This simplifies our life: now we can install the X.Org driver unconditionally and it will just not be used if the kernel driver is there (or the hardware is not), but will be used if it can be and the kernel driver is loaded too late. This should solve problems when starting Ubuntu 12.04 guests, where we previously tried to load the kernel driver and install the X.Org driver exactly if it failed to load. We sometimes ended up with both loaded and sometimes with neither.

Location:

trunk/src/VBox/Additions

Files:

• linux/installer/vboxadd-x11.sh (modified) (1 diff)
• linux/installer/vboxadd.sh (modified) (2 diffs)
• x11/vboxvideo/vboxvideo.c (modified) (3 diffs)

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

@@ -374 +374 @@
             ;;
     esac
-    if $MODPROBE vboxvideo; then
-        # Do not install if we can use the kernel driver.
-        rm -f "$modules_dir/drivers/vboxvideo_drv.so"
-        vboxvideo_src=""
-        dox11config=""
-    fi
     test -n "${dox11config}" &&
         begin "Installing $xserver_version modules"
-    rm "$modules_dir/drivers/vboxvideo_drv$driver_ext" 2>/dev/null
-    rm "$modules_dir/input/vboxmouse_drv$driver_ext" 2>/dev/null
-    case "$vboxvideo_src" in ?*)
-        ln -s "$lib_dir/$vboxvideo_src" "$modules_dir/drivers/vboxvideo_drv$driver_ext";;
+    case "$vboxvideo_src" in
+        ?*)
+        ln -s "$lib_dir/$vboxvideo_src" "$modules_dir/drivers/vboxvideo_drv$driver_ext.new" &&
+            mv "$modules_dir/drivers/vboxvideo_drv$driver_ext.new" "$modules_dir/drivers/vboxvideo_drv$driver_ext";;
+        *)
+        rm "$modules_dir/drivers/vboxvideo_drv$driver_ext" 2>/dev/null
     esac
-    case "$vboxmouse_src" in ?*)
-        ln -s "$lib_dir/$vboxmouse_src" "$modules_dir/input/vboxmouse_drv$driver_ext";;
+    case "$vboxmouse_src" in
+        ?*)
+        ln -s "$lib_dir/$vboxmouse_src" "$modules_dir/input/vboxmouse_drv$driver_ext.new" &&
+            mv "$modules_dir/input/vboxmouse_drv$driver_ext.new" "$modules_dir/input/vboxmouse_drv$driver_ext.new";;
+        *)
+        rm "$modules_dir/input/vboxmouse_drv$driver_ext" 2>/dev/null
     esac
     succ_msg "$xserver_version modules installed"

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

@@ -17 +17 @@
 
 
-# chkconfig: 345 30 70
+# chkconfig: 345 10 90
 # description: VirtualBox Linux Additions kernel modules
 #
@@ -210 +210 @@
         }
     }
-
+    # Load the kernel video driver if we can.
+    $MODPROBE vboxvideo > /dev/null 2>&1
+
+    # Put the X.Org driver in place.  This is harmless if it is not needed.
     /sbin/rcvboxadd-x11 setup
     # Install the guest OpenGL drivers.  For now we don't support

trunk/src/VBox/Additions/x11/vboxvideo/vboxvideo.c

@@ -728 +728 @@
 {
     ScrnInfoPtr pScrn;
+    struct xf86stat_s sstat;
 
     TRACE_ENTRY();
+
+    if (xf86stat("/dev/dri/card0", &sstat) == 0)
+    {
+        xf86Msg(X_INFO, "vboxvideo: kernel driver found, not loading.\n");
+        return FALSE;
+    }
     pScrn = xf86ConfigPciEntity(NULL, 0, entity_num, VBOXPCIchipsets,
                                 NULL, NULL, NULL, NULL, NULL);
@@ -830 +837 @@
     Gamma gzeros = {0.0, 0.0, 0.0};
     rgb rzeros = {0, 0, 0};
-    struct xf86stat_s sstat;
 
     TRACE_ENTRY();
@@ -853 +859 @@
     if (!xf86LoadSubModule(pScrn, "vgahw"))
         return FALSE;
-
-    if (xf86stat("/dev/dri/card0", &sstat) == 0)
-    {
-        xf86DrvMsg(pScrn->scrnIndex, X_INFO, "kernel driver found, not loading.\n");
-        return FALSE;
-    }
 
     /* Get our private data from the ScrnInfoRec structure. */