Changeset 49639 in vbox for trunk/src/VBox/Additions/x11/vboxvideo

Timestamp:

Nov 25, 2013 11:56:00 AM (11 years ago)

Author:

vboxsync

Message:

Additions/x11/vboxvideo: fix virtual consoles if KMS is not present.

File:

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

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

@@ -1227 +1227 @@
         DRILock(xf86ScrnToScreen(pScrn), 0);
 #elif defined(VBOX_DRI)  /* DRI2 */
-    if (pVBox->drmFD >= 0)
+    if (   pVBox->drmFD < 0
         /* Tell the kernel driver, if present, that it can use the framebuffer
          * driver again. */
-        drmIoctl(pVBox->drmFD, VBOXVIDEO_IOCTL_ENABLE_HGSMI, NULL);
-    else
+        || drmIoctl(pVBox->drmFD, VBOXVIDEO_IOCTL_ENABLE_HGSMI, NULL) < 0)
 #endif
         VBOXRestoreMode(pScrn);
@@ -1251 +1250 @@
     }
 #ifdef VBOX_DRI
-# ifndef VBOX_DRI_OLD  /* DRI2 */
-    if (pVBox->drmFD >= 0)
-        /* Tell the kernel driver, if present, that we are going away. */
-        drmIoctl(pVBox->drmFD, VBOXVIDEO_IOCTL_ENABLE_HGSMI, NULL);
-# endif
     if (pVBox->useDRI)
         VBOXDRICloseScreen(pScreen, pVBox);
     pVBox->useDRI = false;
-#endif
-
-    if (pScrn->vtSema) {
-        VBOXRestoreMode(pScrn);
+# ifndef VBOX_DRI_OLD  /* DRI2 */
+    if (   pVBox->drmFD < 0
+        /* Tell the kernel driver, if present, that we are going away. */
+        || drmIoctl(pVBox->drmFD, VBOXVIDEO_IOCTL_ENABLE_HGSMI, NULL) < 0)
+# endif
+#endif
+        if (pScrn->vtSema)
+            VBOXRestoreMode(pScrn);
+    if (pScrn->vtSema)
         VBOXUnmapVidMem(pScrn);
-    }
     pScrn->vtSema = FALSE;