Changeset 52865 in vbox for trunk/src/VBox

Timestamp:

Sep 26, 2014 9:29:33 AM (10 years ago)

Author:

vboxsync

Message:

Additions/x11/vboxvideo: drop custom ioctl to kernel driver, as the standard one works just as well.

File:

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

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

@@ -1164 +1164 @@
     {
         /* Tell the kernel driver, if present, that we are taking over. */
-        drmIoctl(pVBox->drmFD, VBOXVIDEO_IOCTL_DISABLE_HGSMI, NULL);
         drmSetMaster(pVBox->drmFD);
     }
@@ -1198 +1197 @@
         DRILock(xf86ScrnToScreen(pScrn), 0);
 #elif defined(VBOX_DRI)  /* DRI2 */
-    if (pVBox->drmFD >= 0)
-        drmDropMaster(pVBox->drmFD);
-    /* Tell the kernel driver, if present, that it can use the framebuffer
-     * driver again.  If not, or if that fails, restore the old mode ourselves.
-     */
-    if (   pVBox->drmFD < 0
-        || drmIoctl(pVBox->drmFD, VBOXVIDEO_IOCTL_ENABLE_HGSMI, NULL) < 0)
-#endif
+    /* 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)
+    VBOXRestoreMode(pScrn);
+#endif
 #ifdef SET_HAVE_VT_PROPERTY
     updateHasVTProperty(pScrn, FALSE);