Changeset 8531 in vbox

Timestamp:

May 2, 2008 3:20:27 PM (17 years ago)

Author:

vboxsync

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

30435

Message:

Additions/x11: disable framebuffer access during mode switches and don't touch the video hardware if xrandr is called while we are in text mode

Location:

trunk/src/VBox/Additions/x11/xgraphics

Files:

• vboxvideo.h (modified) (2 diffs)
• vboxvideo_13.c (modified) (9 diffs)

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

@@ -147 +147 @@
     int nDGAMode;
     CloseScreenProcPtr CloseScreen;
+    /** Default X server procedure for enabling and disabling framebuffer access */
+    xf86EnableDisableFBAccessProc *EnableDisableFBAccess;
+    /** Is access to the framebuffer currently allowed? */
+    Bool accessEnabled;
     OptionInfoPtr Options;
     IOADDRESS ioBase;
@@ -155 +159 @@
     Bool pointerOffscreen;
     Bool useDevice;
+    /** Are we currently switched to a virtual terminal?  If so, it is not
+     * safe to touch the hardware. */
+    Bool vtSwitch;
     Bool useVbva;
     VMMDevMemory *pVMMDevMemory;

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

@@ -803 +803 @@
 }
 
+/**
+ * This function hooks into the chain that is called when framebuffer access
+ * is allowed or disallowed by a call to EnableDisableFBAccess in the server.
+ * In other words, it observes when the server wishes access to the 
+ * framebuffer to be enabled and when it should be disabled.  We need to know
+ * this because we disable access ourselves during mode switches (presumably
+ * the server should do this but it doesn't) and want to know whether to
+ * restore it or not afterwards. 
+ */
+static void
+vboxEnableDisableFBAccess(int scrnIndex, Bool enable)
+{
+    ScrnInfoPtr pScrn = xf86Screens[scrnIndex];
+    VBOXPtr pVBox = VBOXGetRec(pScrn);
+
+    pVBox->accessEnabled = enable;
+    pVBox->EnableDisableFBAccess(scrnIndex, enable);
+}
+
 /*
  * QUOTE from the XFree86 DESIGN document:
@@ -887 +906 @@
     xf86SetBackingStore(pScreen);
 
+    /* We need to keep track of whether we are currently switched to a virtual
+     * terminal to know whether a mode set operation is currently safe to do.
+     */
+    pVBox->vtSwitch = FALSE;
     /* Initialise DGA.  The cast is unfortunately correct - it gets cast back
        to (unsigned char *) later. */
@@ -916 +939 @@
         VBOXLoadPalette, NULL, flags))
         return (FALSE);
+
+    /* Hook our observer function ito the chain which is called when
+     * framebuffer access is enabled or disabled in the server, and
+     * assume an initial state of enabled. */
+    pVBox->accessEnabled = TRUE;
+    pVBox->EnableDisableFBAccess = pScrn->EnableDisableFBAccess;
+    pScrn->EnableDisableFBAccess = vboxEnableDisableFBAccess;
 
     pVBox->CloseScreen = pScreen->CloseScreen;
@@ -946 +976 @@
 {
     ScrnInfoPtr pScrn = xf86Screens[scrnIndex];
-
+    VBOXPtr pVBox = VBOXGetRec(pScrn);
+
+    pVBox->vtSwitch = FALSE;
     return xf86SetDesiredModes(pScrn);
 }
@@ -960 +992 @@
         vboxDisableVbva(pScrn);
     vboxDisableGraphicsCap(pVBox);
+    pVBox->vtSwitch = TRUE;
 }
 
@@ -980 +1013 @@
     pScrn->vtSema = FALSE;
 
+    /* Remove our observer functions from the X server call chains. */
+    pScrn->EnableDisableFBAccess = pVBox->EnableDisableFBAccess;
     pScreen->CloseScreen = pVBox->CloseScreen;
     return pScreen->CloseScreen(scrnIndex, pScreen);
@@ -1047 +1082 @@
 {
     ScrnInfoPtr pScrn;
+    VBOXPtr pVBox;
+    Bool rc;
 
     pScrn = xf86Screens[scrnIndex];  /* Why does X have three ways of refering to the screen? */
-    return xf86SetSingleMode(pScrn, pMode, 0);
+    pVBox = VBOXGetRec(pScrn);
+    /* We want to disable access to the framebuffer before switching mode.
+     * After doing the switch, we allow access if it was allowed before. */
+    if (pVBox->accessEnabled)
+        pVBox->EnableDisableFBAccess(scrnIndex, FALSE);
+    rc = xf86SetSingleMode(pScrn, pMode, 0);
+    if (pVBox->accessEnabled)
+        pVBox->EnableDisableFBAccess(scrnIndex, TRUE);
+    return rc;
 }
 
@@ -1060 +1105 @@
     int bpp = pScrn->depth == 24 ? 32 : 16;
     pVBox = VBOXGetRec(pScrn);
+    /* Don't fiddle with the hardware if we are switched
+     * to a virtual terminal. */
+    if (pVBox->vtSwitch == TRUE)
+        return TRUE;
     if (pVBox->useVbva == TRUE)
         if (vboxDisableVbva(pScrn) != TRUE)  /* This would be bad. */
@@ -1098 +1147 @@
     VBOXPtr pVBox = VBOXGetRec(xf86Screens[scrnIndex]);
 
+    /* Don't fiddle with the hardware if we are switched
+     * to a virtual terminal. */
+    if (pVBox->vtSwitch == TRUE)
+        return;
     VBESetDisplayStart(pVBox->pVbe, x, y, TRUE);
 }