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

Timestamp:

Nov 28, 2013 9:46:38 AM (11 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

90966

Message:

Additions/x11/vboxvideo: fixes for when DRI fails to initialise.

Location:

trunk/src/VBox/Additions/x11/vboxvideo

Files:

• undefined (modified) (1 diff)
• vboxvideo_dri.c (modified) (3 diffs)

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

@@ -28 +28 @@
 chown
 close
+drmClose
 drmFreeVersion
 drmGetVersion

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

@@ -271 +271 @@
         TRACE_LOG("Calling DRIScreenInit\n");
         if (!DRIScreenInit(pScreen, pDRIInfo, &pVBox->drmFD))
+        {
             rc = FALSE;
-        if (!rc)
             xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
                        "DRIScreenInit failed, disabling DRI.\n");
+            if (pVBox->drmFD)
+            {
+                drmClose(pVBox->drmFD);
+                pVBox->drmFD = -1;
+            }
+        }
     }
     if (rc && !VBOXInitVisualConfigs(pScrn, pVBox))
@@ -282 +288 @@
         rc = FALSE;
     }
-    xf86DrvMsg(pScrn->scrnIndex, X_INFO, "visual configurations initialized\n");
+    else
+        xf86DrvMsg(pScrn->scrnIndex, X_INFO, "visual configurations initialized\n");
 
     /* Check the DRM version */
@@ -305 +312 @@
     if (!rc)
     {
+        if (pVBox->drmFD >= 0)
+           VBOXDRICloseScreen(pScreen, pVBox);
+        pVBox->drmFD = -1;
         if (pVBox->pDRIInfo)
             DRIDestroyInfoRec(pVBox->pDRIInfo);
         pVBox->pDRIInfo = NULL;
-        if (pVBox->drmFD >= 0)
-           VBOXDRICloseScreen(pScreen, pVBox);
-        pVBox->drmFD = -1;
     }
     TRACE_LOG("returning %s\n", BOOL_STR(rc));