Changeset 59235 in vbox

Timestamp:

Dec 31, 2015 10:45:50 AM (9 years ago)

Author:

vboxsync

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

104863

Message:

bugref:8087: Additions/x11: support non-root X server: refuse to load our DDX user space driver if the kernel driver is found. This is more an emergency solution than anything else, since if we reach this code the X server will refuse to load altogether. The set-up script code should prevent it happening though. I wonder whether there is a more graceful way to handle it nonetheless.

File:

• trunk/src/VBox/Additions/x11/vboxvideo/vboxvideo.c (modified) (4 diffs)

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

@@ -94 +94 @@
 # include <stdlib.h>
 # include <string.h>
+# include <sys/stat.h>
+# define xf86stat stat
+# define xf86stat_s stat
+#else
+# include <xf86_ansic.h>
 #endif
 
@@ -823 +828 @@
     Gamma gzeros = {0.0, 0.0, 0.0};
     rgb rzeros = {0, 0, 0};
+    struct xf86stat_s sstat;
 
     TRACE_ENTRY();
@@ -831 +837 @@
     xf86DrvMsg(pScrn->scrnIndex, X_INFO, "VirtualBox guest additions video driver version " VBOX_VERSION_STRING "r%d\n",
                VBOX_SVN_REV);
+
+    /* The ramdac module is needed for the hardware cursor. */
+    if (!xf86LoadSubModule(pScrn, "ramdac"))
+        return FALSE;
+
+    /* The framebuffer module. */
+    if (!xf86LoadSubModule(pScrn, "fb"))
+        return (FALSE);
+
+    if (!xf86LoadSubModule(pScrn, "shadowfb"))
+        return FALSE;
+
+    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. */
@@ -840 +866 @@
     /* Entity information seems to mean bus information. */
     pVBox->pEnt = xf86GetEntityInfo(pScrn->entityList[0]);
-
-    /* The ramdac module is needed for the hardware cursor. */
-    if (!xf86LoadSubModule(pScrn, "ramdac"))
-        return FALSE;
-
-    /* The framebuffer module. */
-    if (!xf86LoadSubModule(pScrn, "fb"))
-        return (FALSE);
-
-    if (!xf86LoadSubModule(pScrn, "shadowfb"))
-        return FALSE;
-
-    if (!xf86LoadSubModule(pScrn, "vgahw"))
-        return FALSE;
 
 #ifndef PCIACCESS