Changeset 57092 in vbox for trunk/src/VBox/Additions

Timestamp:

Jul 27, 2015 11:07:29 AM (9 years ago)

Author:

vboxsync

Message:

Additions/x11/vboxvideo: make VT handling more systematic.

File:

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

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

@@ -285 +285 @@
             return FALSE;
         }
-        vbvxClearVRAM(pScrn, ((size_t)pScrn->virtualX) * pScrn->virtualY * (pScrn->bitsPerPixel / 8),
-                      ((size_t)adjustedWidth) * height * (pScrn->bitsPerPixel / 8));
+        if (pScrn->vtSema)
+            vbvxClearVRAM(pScrn, ((size_t)pScrn->virtualX) * pScrn->virtualY * (pScrn->bitsPerPixel / 8),
+                          ((size_t)adjustedWidth) * height * (pScrn->bitsPerPixel / 8));
         pScreen->ModifyPixmapHeader(pPixmap, adjustedWidth, height, pScrn->depth, pScrn->bitsPerPixel, cbLine, pVBox->base);
     }
@@ -300 +301 @@
 /** Set a video mode to the hardware, RandR 1.1 version.  Since we no longer do
  * virtual frame buffers, adjust the screen pixmap dimensions to match. */
-static void setModeRandR11(ScrnInfoPtr pScrn, DisplayModePtr pMode, bool fScreenInitTime)
+static void setModeRandR11(ScrnInfoPtr pScrn, DisplayModePtr pMode, bool fScreenInitTime, bool fEnterVTTime)
 {
     VBOXPtr pVBox = VBOXGetRec(pScrn);
@@ -317 +318 @@
         xf86ScrnToScreen(pScrn)->width = pMode->HDisplay;
         xf86ScrnToScreen(pScrn)->height = pMode->VDisplay;
+        /* This prevents a crash in CentOS 3.  I was unable to debug it to
+         * satisfaction, partly due to the lack of symbols.  My guess is that
+         * pScrn->ModifyPixmapHeader() expects certain things to be set up when
+         * it sees pScrn->vtSema set to true which are not quite done at this
+         * point of the VT switch. */
+        if (fEnterVTTime)
+            pScrn->vtSema = FALSE;
         adjustScreenPixmap(pScrn, pMode->HDisplay, pMode->VDisplay);
-    }
-    if (pMode->HDisplay != 0 && pMode->VDisplay != 0)
+        if (fEnterVTTime)
+            pScrn->vtSema = TRUE;
+    }
+    if (pMode->HDisplay != 0 && pMode->VDisplay != 0 && pScrn->vtSema)
         vbvxSetMode(pScrn, 0, pMode->HDisplay, pMode->VDisplay, 0, 0, true, true, &frameBuffer);
     pScrn->currentMode = pMode;
@@ -348 +358 @@
                originalX, originalY));
     for (i = cFirst; i < cLast; ++i)
-        if (pVBox->pScreens[i].paCrtcs->mode.HDisplay != 0 && pVBox->pScreens[i].paCrtcs->mode.VDisplay != 0)
+        if (pVBox->pScreens[i].paCrtcs->mode.HDisplay != 0 && pVBox->pScreens[i].paCrtcs->mode.VDisplay != 0 && pScrn->vtSema)
             vbvxSetMode(pScrn, i, pVBox->pScreens[i].paCrtcs->mode.HDisplay, pVBox->pScreens[i].paCrtcs->mode.VDisplay,
                         pVBox->pScreens[i].paCrtcs->x, pVBox->pScreens[i].paCrtcs->y, pVBox->pScreens[i].fPowerOn,
@@ -372 +382 @@
 
     TRACE_LOG("width=%d, height=%d\n", cw, ch);
-    /* Don't fiddle with the hardware if we are switched
-     * to a virtual terminal. */
-    if (!pScrn->vtSema) {
-        xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
-                   "We do not own the active VT, exiting.\n");
-        return TRUE;
-    }
     rc = adjustScreenPixmap(pScrn, cw, ch);
     /* Power-on all screens (the server expects this) and set the new pitch to them. */
@@ -439 +442 @@
     pVBox->pScreens[cDisplay].aScreenLocation.x = x;
     pVBox->pScreens[cDisplay].aScreenLocation.y = y;
-    /* Don't fiddle with the hardware if we are switched
-     * to a virtual terminal. */
-    if (!crtc->scrn->vtSema)
-    {
-        xf86DrvMsg(crtc->scrn->scrnIndex, X_ERROR,
-                   "We do not own the active VT, exiting.\n");
-        return;
-    }
     setModeRandR12(crtc->scrn, cDisplay);
 }
@@ -1169 +1164 @@
     setSizesRandR11(pScrn);
 #endif
+    /* This calls EnableDisableFBAccess(), so only use when switched in. */
     if (pScrn->vtSema)
         vbvxReprobeCursor(pScrn);
@@ -1341 +1337 @@
 #else
     /* set first video mode */
-    setModeRandR11(pScrn, pScrn->currentMode, true);
+    setModeRandR11(pScrn, pScrn->currentMode, true, false);
 #endif
 
@@ -1414 +1410 @@
     setSizesAndCursorIntegration(pScrn, false);
 #else
-    /* This prevents a crash in CentOS 3.  I was unable to debug it to
-     * satisfaction, partly due to the lack of symbols.  My guess is that
-     * pScrn->ModifyPixmapHeader() expects certain things to be set up when
-     * it sees pScrn->vtSema set to true which are not quite done at this
-     * point of the VT switch. */
-    pScrn->vtSema = FALSE;
-    setModeRandR11(pScrn, pScrn->currentMode, false);
-    pScrn->vtSema = TRUE;
+    setModeRandR11(pScrn, pScrn->currentMode, false, true);
 #endif
 #ifdef SET_HAVE_VT_PROPERTY
@@ -1513 +1502 @@
 
     TRACE_LOG("HDisplay=%d, VDisplay=%d\n", pMode->HDisplay, pMode->VDisplay);
-    if (!pScrn->vtSema)
-    {
-        xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
-                   "We do not own the active VT, exiting.\n");
-        return TRUE;
-    }
 #ifdef VBOXVIDEO_13
     rc = xf86SetSingleMode(pScrn, pMode, RR_Rotate_0);
 #else
-    setModeRandR11(pScrn, pMode, false);
+    setModeRandR11(pScrn, pMode, false, false);
 #endif
     TRACE_LOG("returning %s\n", rc ? "TRUE" : "FALSE");