Changeset 53426 in vbox for trunk/src

Timestamp:

Dec 2, 2014 9:17:02 PM (10 years ago)

Author:

vboxsync

Message:

Additions/x11/vboxvideo: fix VT switching without a kernel driver.

Location:

trunk/src/VBox/Additions/x11

Files:

• undefined_xorg (modified) (1 diff)
• vboxvideo/vboxvideo.c (modified) (3 diffs)

trunk/src/VBox/Additions/x11/undefined_xorg

@@ -29 +29 @@
 drmGetVersion
 drmIoctl
+drmModeGetResources
+drmModeFreeResources
 drmSetMaster
 ___errno

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

@@ -115 +115 @@
 #ifdef VBOX_DRI
 # include "xf86drm.h"
+# include "xf86drmMode.h"
 #endif
 
@@ -1201 +1202 @@
         DRILock(xf86ScrnToScreen(pScrn), 0);
 #elif defined(VBOX_DRI)  /* DRI2 */
-    /* Expected failure mode: KMS not supported, drmDropMaster() fails. */
-    if (pVBox->drmFD < 0 || drmDropMaster(pVBox->drmFD) < 0)
-        VBOXRestoreMode(pScrn);
-#endif
-#if !defined(VBOX_DRI) || defined(VBOX_DRI_OLD)
+    if (pVBox->drmFD >= 0)
+        drmDropMaster(pVBox->drmFD);
+#endif
     VBOXRestoreMode(pScrn);
-#endif
 #ifdef SET_HAVE_VT_PROPERTY
     updateHasVTProperty(pScrn, FALSE);
@@ -1396 +1394 @@
     VBOXPtr pVBox = VBOXGetRec(pScrn);
     vgaRegPtr vgaReg;
+#ifdef VBOX_DRI
+    drmModeResPtr pRes;
+#endif
 
     TRACE_ENTRY();
+#ifdef VBOX_DRI
+    /* Do not try to re-set the VGA state if a mode-setting driver is loaded. */
+    if (   pVBox->drmFD >= 0
+        && LoaderSymbol("drmModeGetResources") != NULL
+        && (pRes == drmModeGetResources(pVBox->drmFD)) != NULL)
+    {
+        drmModeFreeResources(pRes);
+        return;
+    }
+#endif
     vgaReg = &VGAHWPTR(pScrn)->SavedReg;
     vgaHWRestore(pScrn, vgaReg, VGA_SR_ALL);