Changeset 51374 in vbox for trunk

Timestamp:

May 23, 2014 3:59:13 PM (11 years ago)

Author:

vboxsync

Message:

Additions/x11/vboxvideo: properly report the file descriptor for the kernel driver to allow authentication to work.

Location:

trunk/src/VBox/Additions/x11/vboxvideo

Files:

• undefined (modified) (1 diff)
• vboxvideo.c (modified) (2 diffs)
• vboxvideo_dri2.c (modified) (4 diffs)

trunk/src/VBox/Additions/x11/vboxvideo/undefined

@@ -36 +36 @@
 close
 drmClose
+drmDropMaster
 drmFreeVersion
 drmGetVersion
 drmIoctl
+drmSetMaster
 fbPictureInit
 fbScreenInit

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

@@ -1225 +1225 @@
 #elif defined(VBOX_DRI)  /* DRI2 */
     if (pVBox->drmFD >= 0)
+    {
         /* Tell the kernel driver, if present, that we are taking over. */
         drmIoctl(pVBox->drmFD, VBOXVIDEO_IOCTL_DISABLE_HGSMI, NULL);
+        drmSetMaster(pVBox->drmFD);
+    }
 #endif
     if (pVBox->fHaveHGSMI)
@@ -1260 +1263 @@
         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
-        /* Tell the kernel driver, if present, that it can use the framebuffer
-         * driver again. */
         || drmIoctl(pVBox->drmFD, VBOXVIDEO_IOCTL_ENABLE_HGSMI, NULL) < 0)
 #endif

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

@@ -62 +62 @@
 
     memset(&DRI2Info, 0, sizeof(DRI2Info));
+    pVBox->drmFD = -1;
     for (i = 0; i < RT_ELEMENTS(devicePaths); ++i)
     {
@@ -70 +71 @@
             if (   pVersion
                 && pVersion->name_len
-                && !strcmp(pVersion->name, VBOX_DRM_DRIVER_NAME))
+                && !strcmp(pVersion->name, VBOX_DRM_DRIVER_NAME)
+                && drmSetMaster(fd) == 0)
             {
                 TRACE_LOG("Opened drm device %s\n", devicePaths[i]);
@@ -86 +88 @@
         return FALSE;
     DRI2Info.version = 3;
-    DRI2Info.fd = -1;
+    DRI2Info.fd = pVBox->drmFD;
     DRI2Info.driverName = VBOX_DRI_DRIVER_NAME;
     DRI2Info.CopyRegion = VBOXDRICopyRegion;
@@ -98 +100 @@
 {
     DRI2CloseScreen(pScreen);
-    if (pVBox->drmFD)
+    if (pVBox->drmFD >= 0)
         close(pVBox->drmFD);
 }