Changeset 50568 in vbox

Timestamp:

Feb 25, 2014 7:11:00 AM (11 years ago)

Author:

vboxsync

Message:

Additions/x11/vboxvideo: fix video mode restore if the kernel driver is in use.

File:

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

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

@@ -1243 +1243 @@
     ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen);
     VBOXPtr pVBox = VBOXGetRec(pScrn);
-
+#if defined(VBOX_DRI) && !defined(VBOX_DRI_OLD)  /* DRI2 */
+    BOOL fRestore = TRUE;
+#endif
     if (pScrn->vtSema)
     {
@@ -1255 +1257 @@
     }
 #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) >= 0)
+        fRestore = false;
+# endif
     if (pVBox->useDRI)
         VBOXDRICloseScreen(pScreen, pVBox);
     pVBox->useDRI = false;
-# 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 defined(VBOX_DRI) && !defined(VBOX_DRI_OLD)  /* DRI2 */
+    if (fRestore)
 #endif
         if (pScrn->vtSema)