Changeset 35268 in vbox

Timestamp:

Dec 20, 2010 11:30:58 PM (14 years ago)

Author:

vboxsync

Message:

Additions/x11/vboxvideo: blank the screen on server termination and VT switches too

Location:

trunk/src/VBox/Additions/x11/vboxvideo

Files:

• vboxutils.c (modified) (4 diffs)
• vboxvideo.c (modified) (10 diffs)
• vboxvideo.h (modified) (1 diff)
• vboxvideo_dri.c (modified) (2 diffs)

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

@@ -244 +244 @@
         pViews[i].u32ViewOffset = 0;
         pViews[i].u32ViewSize = pVBox->cbView;
-        pViews[i].u32MaxScreenSize = pVBox->cbFramebuffer;
+        pViews[i].u32MaxScreenSize = pVBox->cbFBMax;
     }
     return VINF_SUCCESS;
@@ -309 +309 @@
         return FALSE;
     }
-    pVBox->cbView = pVBox->cbFramebuffer = offVRAMBaseMapping;
+    pVBox->cbView = pVBox->cbFBMax = offVRAMBaseMapping;
     pVBox->cScreens = VBoxHGSMIGetMonitorCount(&pVBox->guestCtx);
     xf86DrvMsg(pScrn->scrnIndex, X_INFO, "Requested monitor count: %u\n",
@@ -315 +315 @@
     for (i = 0; i < pVBox->cScreens; ++i)
     {
-        pVBox->cbFramebuffer -= VBVA_MIN_BUFFER_SIZE;
-        pVBox->aoffVBVABuffer[i] = pVBox->cbFramebuffer;
+        pVBox->cbFBMax -= VBVA_MIN_BUFFER_SIZE;
+        pVBox->aoffVBVABuffer[i] = pVBox->cbFBMax;
         TRACE_LOG("VBVA buffer offset for screen %u: 0x%lx\n", i,
-                  (unsigned long) pVBox->cbFramebuffer);
+                  (unsigned long) pVBox->cbFBMax);
         VBoxVBVASetupBufferContext(&pVBox->aVbvaCtx[i],
                                    pVBox->aoffVBVABuffer[i], 
@@ -324 +324 @@
     }
     TRACE_LOG("Maximum framebuffer size: %lu (0x%lx)\n",
-              (unsigned long) pVBox->cbFramebuffer,
-              (unsigned long) pVBox->cbFramebuffer);
+              (unsigned long) pVBox->cbFBMax,
+              (unsigned long) pVBox->cbFBMax);
     rc = VBoxHGSMISendViewInfo(&pVBox->guestCtx, pVBox->cScreens,
                                vboxFillViewInfo, (void *)pVBox);

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

@@ -837 +837 @@
     /* Using the PCI information caused problems with non-powers-of-two
        sized video RAM configurations */
-    pVBox->cbFramebuffer = inl(VBE_DISPI_IOPORT_DATA);
-    pScrn->videoRam = pVBox->cbFramebuffer / 1024;
+    pVBox->cbFBMax = inl(VBE_DISPI_IOPORT_DATA);
+    pScrn->videoRam = pVBox->cbFBMax / 1024;
 
     /* Check if the chip restricts horizontal resolution or not. */
@@ -1152 +1152 @@
 }
 
+/** Clear the virtual framebuffer in VRAM.  Optionally also clear up to the
+ * size of a new framebuffer.  Framebuffer sizes larger than available VRAM
+ * be treated as zero and passed over. */
+static void
+vboxClearVRAM(ScrnInfoPtr pScrn, int32_t cNewX, int32_t cNewY)
+{
+    VBOXPtr pVBox = VBOXGetRec(pScrn);
+    int64_t cbOldFB, cbNewFB;
+
+    cbOldFB = pVBox->cbLine * pScrn->virtualX;
+    cbNewFB = vboxLineLength(pScrn, cNewX) * cNewY;
+    if (cbOldFB > pVBox->cbFBMax)
+        cbOldFB = 0;
+    if (cbNewFB > pVBox->cbFBMax)
+        cbNewFB = 0;
+    memset(pVBox->base, 0, max(cbOldFB, cbNewFB));
+}
+
 static Bool
 VBOXEnterVT(int scrnIndex, int flags)
@@ -1159 +1177 @@
 
     TRACE_ENTRY();
+    vboxClearVRAM(pScrn, 0, 0);
     if (pVBox->fHaveHGSMI)
         vboxEnableVbva(pScrn);
@@ -1186 +1205 @@
     TRACE_ENTRY();
     pVBox->vtSwitch = TRUE;
-    VBOXSaveRestore(pScrn, MODE_RESTORE);
     if (pVBox->fHaveHGSMI)
         vboxDisableVbva(pScrn);
+    vboxClearVRAM(pScrn, 0, 0);
+    VBOXSaveRestore(pScrn, MODE_RESTORE);
     vboxDisableGraphicsCap(pVBox);
 #ifdef VBOX_DRI
@@ -1203 +1223 @@
     VBOXPtr pVBox = VBOXGetRec(pScrn);
 
+    if (pVBox->fHaveHGSMI)
+        vboxDisableVbva(pScrn);
+    vboxDisableGraphicsCap(pVBox);
+    vboxClearVRAM(pScrn, 0, 0);
 #ifdef VBOX_DRI
     if (pVBox->useDRI)
@@ -1209 +1233 @@
 #endif
 
-    if (pVBox->fHaveHGSMI)
-        vboxDisableVbva(pScrn);
-    vboxDisableGraphicsCap(pVBox);
     if (pScrn->vtSema) {
         VBOXSaveRestore(xf86Screens[scrnIndex], MODE_RESTORE);
@@ -1289 +1310 @@
      * too large for VRAM as we sometimes have to do this - see comments in
      * VBOXPreInit. */
-    if (   offStart + pVBox->cbLine * cHeight > pVBox->cbFramebuffer
-        || pVBox->cbLine * pScrn->virtualY > pVBox->cbFramebuffer)
+    if (   offStart + pVBox->cbLine * cHeight > pVBox->cbFBMax
+        || pVBox->cbLine * pScrn->virtualY > pVBox->cbFBMax)
         fActive = FALSE;
     /* Deactivate the screen if it is outside of the virtual framebuffer and
@@ -1329 +1350 @@
     VBOXPtr pVBox = VBOXGetRec(pScrn);
     uint64_t cbLine = vboxLineLength(pScrn, width);
-    uint32_t cbOldPixmap;
 
     TRACE_LOG("width=%d, height=%d\n", width, height);
@@ -1337 +1357 @@
         return FALSE;
     }
-    if (cbLine > UINT32_MAX || cbLine * height >= pVBox->cbFramebuffer)
+    if (cbLine > UINT32_MAX || cbLine * height >= pVBox->cbFBMax)
     {
         xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
                    "Unable to set up a virtual screen size of %dx%d with %lu of %d Kb of video memory available.  Please increase the video memory size.\n",
-                   width, height, pVBox->cbFramebuffer / 1024, pScrn->videoRam);
+                   width, height, pVBox->cbFBMax / 1024, pScrn->videoRam);
         return FALSE;
     }
@@ -1347 +1367 @@
                                 pScrn->depth, vboxBPP(pScrn), cbLine,
                                 pVBox->base);
-    cbOldPixmap = pVBox->cbLine * pScrn->virtualY;
-    if (cbOldPixmap > pVBox->cbFramebuffer)
-        cbOldPixmap = 0;
+    vboxClearVRAM(pScrn, width, height);
     pScrn->virtualX = width;
     pScrn->virtualY = height;
     pScrn->displayWidth = vboxDisplayPitch(pScrn, cbLine);
     pVBox->cbLine = cbLine;
-    /* Clear video RAM for esthetic reasons */
-    memset(pVBox->base, 0, max(cbLine * height, cbOldPixmap));
 #ifdef VBOX_DRI
     if (pVBox->useDRI)

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

@@ -184 +184 @@
     void *base;
     /** The amount of VRAM available for use as a framebuffer */
-    unsigned long cbFramebuffer;
+    unsigned long cbFBMax;
     /** The size of the framebuffer and the VBVA buffers at the end of it. */
     unsigned long cbView;

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

@@ -175 +175 @@
         || (pVBox->pciInfo == NULL)
         || (pVBox->base == NULL)
-        || (pVBox->cbFramebuffer == 0))
+        || (pVBox->cbFBMax == 0))
     {
         xf86DrvMsg(pScrn->scrnIndex, X_ERROR, "%s: preconditions failed\n",
@@ -256 +256 @@
         pDRIInfo->maxDrawableTableEntry = VBOX_MAX_DRAWABLES;
         pDRIInfo->frameBufferPhysicalAddress = (pointer)pScrn->memPhysBase;
-        pDRIInfo->frameBufferSize = pVBox->cbFramebuffer;
+        pDRIInfo->frameBufferSize = pVBox->cbFBMax;
         pDRIInfo->frameBufferStride =   pScrn->displayWidth
                                       * pScrn->bitsPerPixel / 8;