Changeset 7443 in vbox for trunk/src/VBox/Additions/x11

Timestamp:

Mar 13, 2008 3:56:58 PM (17 years ago)

Author:

vboxsync

Message:

Additions/X11: make the X11 drivers work again when the kernel module fails to load

Location:

trunk/src/VBox/Additions/x11/xgraphics

Files:

• vboxutils.c (modified) (8 diffs)
• vboxvideo.h (modified) (2 diffs)
• vboxvideo_13.c (modified) (7 diffs)
• vboxvideo_70.c (modified) (3 diffs)

trunk/src/VBox/Additions/x11/xgraphics/vboxutils.c

@@ -315 +315 @@
 
 Bool
-vbox_init(int scrnIndex)
+vbox_init(int scrnIndex, VBOXPtr pVBox)
 {
     Bool rc = TRUE;
@@ -321 +321 @@
     if (RT_FAILURE(vrc))
     {
-        xf86DrvMsg(scrnIndex, X_ERROR, "VbglR3Init failed rc=%d.\n", rc);
+        xf86DrvMsg(scrnIndex, X_ERROR,
+                   "Failed to initialize the VirtualBox device (rc=%d) - make sure that the VirtualBox guest additions are properly installed.  If you are not sure, try reinstalling them.  The X Window graphics drivers will run in compatibility mode.\n",
+                   vrc);
         rc = FALSE;
     }
+    pVBox->useDevice = rc;
     return rc;
 }
@@ -337 +340 @@
     TRACE_ENTRY();
 
+    if (!pVBox->useDevice)
+        return FALSE;
     pVBox->useVbva = FALSE;
 
@@ -733 +738 @@
     Bool rc;
 
+    if (!pVBox->useDevice)
+        return FALSE;
     pVBox->pCurs = pCurs = xf86CreateCursorInfoRec();
     if (!pCurs)
@@ -830 +837 @@
  */
 Bool
-vboxEnableGraphicsCap(void)
-{
+vboxEnableGraphicsCap(VBOXPtr pVBox)
+{
+    if (!pVBox->useDevice)
+        return FALSE;
     return RT_SUCCESS(VbglR3SetGuestCaps(VMMDEV_GUEST_SUPPORTS_GRAPHICS, 0));
 }
@@ -842 +851 @@
  */
 Bool
-vboxDisableGraphicsCap(void)
-{
+vboxDisableGraphicsCap(VBOXPtr pVBox)
+{
+    if (!pVBox->useDevice)
+        return FALSE;
     return RT_SUCCESS(VbglR3SetGuestCaps(0, VMMDEV_GUEST_SUPPORTS_GRAPHICS));
 }
@@ -860 +871 @@
 Bool
 vboxGetDisplayChangeRequest(ScrnInfoPtr pScrn, uint32_t *pcx, uint32_t *pcy,
-                            uint32_t *pcBits, uint32_t *piDisplay)
-{
+                            uint32_t *pcBits, uint32_t *piDisplay,
+                            VBOXPtr pVBox)
+{
+    if (!pVBox->useDevice)
+        return FALSE;
     int rc = VbglR3GetLastDisplayChangeRequest(pcx, pcy, pcBits, piDisplay);
     if (RT_SUCCESS(rc))
@@ -868 +882 @@
     return FALSE;
 }
-

trunk/src/VBox/Additions/x11/xgraphics/vboxvideo.h

@@ -150 +150 @@
     size_t pointerSize;
     Bool pointerOffscreen;
+    Bool useDevice;
     Bool useVbva;
     VMMDevMemory *pVMMDevMemory;
@@ -155 +156 @@
 } VBOXRec, *VBOXPtr;
 
-extern Bool vbox_init(int scrnIndex);
+extern Bool vbox_init(int scrnIndex, VBOXPtr pVBox);
 extern Bool vbox_cursor_init (ScreenPtr pScreen);
-extern Bool vbox_open (ScrnInfoPtr pScrn, ScreenPtr pScreen, VBOXPtr pVBOX);
-extern void vbox_close (ScrnInfoPtr pScrn, VBOXPtr pVBOX);
+extern Bool vbox_open (ScrnInfoPtr pScrn, ScreenPtr pScreen, VBOXPtr pVBox);
+extern void vbox_close (ScrnInfoPtr pScrn, VBOXPtr pVBox);
 
 extern Bool vboxEnableVbva(ScrnInfoPtr pScrn);
 extern Bool vboxDisableVbva(ScrnInfoPtr pScrn);
 
-extern Bool vboxEnableGraphicsCap(void);
-extern Bool vboxDisableGraphicsCap(void);
+extern Bool vboxEnableGraphicsCap(VBOXPtr pVBox);
+extern Bool vboxDisableGraphicsCap(VBOXPtr pVBox);
 
 extern Bool vboxGetDisplayChangeRequest(ScrnInfoPtr pScrn, uint32_t *pcx,
                                         uint32_t *pcy, uint32_t *pcBits,
-                                        uint32_t *piDisplay);
+                                        uint32_t *piDisplay, VBOXPtr pVBox);
 
 #endif /* _VBOXVIDEO_H_ */

trunk/src/VBox/Additions/x11/xgraphics/vboxvideo_13.c

@@ -402 +402 @@
     DisplayModePtr pModes = NULL;
     ScrnInfoPtr pScrn = output->scrn;
+    VBOXPtr pVBox = VBOXGetRec(pScrn);
 
     TRACE;
-    rc = vboxGetDisplayChangeRequest(pScrn, &x, &y, &bpp, &display);
+    rc = vboxGetDisplayChangeRequest(pScrn, &x, &y, &bpp, &display, pVBox);
     /* @todo - check the display number once we support multiple displays. */
     if (rc && (0 != x) && (0 != y)) {
@@ -652 +653 @@
                VBOX_VERSION_STRING "\n");
 
-    /* Initialise the guest library */
-    if (!vbox_init(pScrn->scrnIndex))
-        return FALSE;
-
     /* Get our private data from the ScrnInfoRec structure. */
     pVBox = VBOXGetRec(pScrn);
+
+    /* Initialise the guest library */
+    vbox_init(pScrn->scrnIndex, pVBox);
 
     /* Entity information seems to mean bus information. */
@@ -709 +709 @@
 
         /* We only support 16 and 24 bits depth (i.e. 16 and 32bpp) */
-        if (   vboxGetDisplayChangeRequest(pScrn, &cx, &cy, &cBits, &iDisplay)
+        if (   vboxGetDisplayChangeRequest(pScrn, &cx, &cy, &cBits, &iDisplay,
+                                           pVBox)
             && (cBits != 16))
             cBits = 24;
@@ -925 +926 @@
             xf86DrvMsg(scrnIndex, X_INFO,
                       "The VBox video extensions are now enabled.\n");
-        vboxEnableGraphicsCap();
-    } else
-        xf86DrvMsg(scrnIndex, X_ERROR, "Failed to open the VBox system device - make sure that the VirtualBox guest additions are properly installed.  If you are not sure, try reinstalling them.\n");
+        vboxEnableGraphicsCap(pVBox);
+    }
     return (TRUE);
 }
@@ -948 +948 @@
     if (pVBox->useVbva == TRUE)
         vboxDisableVbva(pScrn);
-    vboxDisableGraphicsCap();
+    vboxDisableGraphicsCap(pVBox);
 }
 
@@ -959 +959 @@
     if (pVBox->useVbva == TRUE)
         vboxDisableVbva(pScrn);
-    vboxDisableGraphicsCap();
+    vboxDisableGraphicsCap(pVBox);
     if (pScrn->vtSema) {
         VBOXSaveRestore(xf86Screens[scrnIndex], MODE_RESTORE);
@@ -1078 +1078 @@
         if (vboxEnableVbva(pScrn) != TRUE)  /* Bad but not fatal */
             pVBox->useVbva = FALSE;
-    vboxEnableGraphicsCap();
+    vboxEnableGraphicsCap(pVBox);
     return (TRUE);
 }

trunk/src/VBox/Additions/x11/xgraphics/vboxvideo_70.c

@@ -391 +391 @@
                VBOX_VERSION_STRING "\n");
 
-    /* Initialise the guest library */
-    if (!vbox_init(pScrn->scrnIndex))
-        return FALSE;
-
      /* Get our private data from the ScrnInfoRec structure. */
     pVBox = VBOXGetRec(pScrn);
+
+    /* Initialise the guest library */
+    vbox_init(pScrn->scrnIndex, pVBox);
 
     /* Entity information seems to mean bus information. */
@@ -467 +466 @@
         uint32_t cx, cy, iDisplay, cBits = 24;
 
-        if (vboxGetDisplayChangeRequest(pScrn, &cx, &cy, &cBits, &iDisplay))
+        if (vboxGetDisplayChangeRequest(pScrn, &cx, &cy, &cBits, &iDisplay,
+                                        pVBox))
         {
             /* We only support 16 and 24 bits depth (i.e. 16 and 32bpp) */
@@ -739 +739 @@
             xf86DrvMsg(scrnIndex, X_INFO,
                       "The VBox video extensions are now enabled.\n");
-    } else
-        xf86DrvMsg(scrnIndex, X_ERROR, "Failed to open the VBox system device - make sure that the VirtualBox guest additions are properly installed.  If you are not sure, try reinstalling them.\n");
+    }
     return (TRUE);
 }