Changeset 2106 in vbox for trunk/src/VBox/Devices/Graphics

Timestamp:

Apr 16, 2007 3:25:48 PM (18 years ago)

Author:

vboxsync

Message:

Do not block EMT while resizing the framebuffer.

Location:

trunk/src/VBox/Devices/Graphics

Files:

• DevVGA.cpp (modified) (27 diffs)
• DevVGA.h (modified) (1 diff)

trunk/src/VBox/Devices/Graphics/DevVGA.cpp

@@ -1406 +1406 @@
  * - flashing
  */
+#ifndef VBOX
 static void vga_draw_text(VGAState *s, int full_update)
+#else
+static int vga_draw_text(VGAState *s, int full_update)
+#endif /* !VBOX */
 {
     int cx, cy, cheight, cw, ch, cattr, height, width, ch_attr;
@@ -1484 +1488 @@
     if ((height * width) > CH_ATTR_SIZE) {
         /* better than nothing: exit if transient size is too big */
+#ifndef VBOX
         return;
+#else
+        return VINF_SUCCESS;
+#endif /* VBOX */
     }
 
@@ -1493 +1501 @@
 #ifndef VBOX
         dpy_resize(s->ds, s->last_scr_width, s->last_scr_height);
-#else /* VBOX */
-        /* For text modes the external memory buffer can not be used, so bpp and cbLine are 0 here. */
-        s->pDrv->pfnResize(s->pDrv, 0, NULL, 0, s->last_scr_width, s->last_scr_height);
-#endif /* VBOX */
         s->last_width = width;
         s->last_height = height;
@@ -1502 +1506 @@
         s->last_cw = cw;
         full_update = 1;
+#else /* VBOX */
+        /* For text modes the direct use of guest VRAM is not implemented, so bpp and cbLine are 0 here. */
+        int rc = s->pDrv->pfnResize(s->pDrv, 0, NULL, 0, s->last_scr_width, s->last_scr_height);
+        s->last_width = width;
+        s->last_height = height;
+        s->last_ch = cheight;
+        s->last_cw = cw;
+        full_update = 1;
+        if (rc == VINF_VGA_RESIZE_IN_PROGRESS)
+            return rc;
+        AssertRC(rc);
+#endif /* VBOX */
     }
     cursor_offset = ((s->cr[0x0e] << 8) | s->cr[0x0f]) - s->start_addr;
@@ -1612 +1628 @@
         s1 += line_offset;
     }
+#ifdef VBOX
+        return VINF_SUCCESS;
+#endif /* VBOX */
 }
 
@@ -1744 +1763 @@
 {
     const unsigned cBits = s->get_bpp(s);
-#if 0 /** @todo kill the nasty resize deadlocks! */
-    int rc = s->pDrv->pfnResize(s->pDrv, cBits, s->CTXSUFF(vram_ptr), s->line_offset, cx, cy);
-    if (rc == VINF_VGA_RESIZE_IN_PROGRESS)
-        return rc;
-    AssertRC(rc);
-#else
     /** @todo r=sunlover: If the guest changes VBE_DISPI_INDEX_X_OFFSET, VBE_DISPI_INDEX_Y_OFFSET
      *                    registers, then the third parameter of the following call should be
      *                    probably 's->CTXSUFF(vram_ptr) + s->vbe_start_addr'.
      */
-    s->pDrv->pfnResize(s->pDrv, cBits, s->CTXSUFF(vram_ptr), s->line_offset, cx, cy);
-#endif
+    int rc = s->pDrv->pfnResize(s->pDrv, cBits, s->CTXSUFF(vram_ptr), s->line_offset, cx, cy);
 
     /* last stuff */
@@ -1764 +1776 @@
     s->last_height = cy;
 
+    if (rc == VINF_VGA_RESIZE_IN_PROGRESS)
+        return rc;
+    AssertRC(rc);
+
     /* update palette */
     switch (s->pDrv->cBits)
@@ -1784 +1800 @@
  * graphic modes
  */
+#ifndef VBOX
 static void vga_draw_graphic(VGAState *s, int full_update)
+#else
+static int vga_draw_graphic(VGAState *s, int full_update)
+#endif /* !VBOX */
 {
     int y1, y, update, page_min, page_max, linesize, y_start, double_scan, mask;
@@ -1875 +1895 @@
         ||  height         != (int)s->last_height
         ||  s->get_bpp(s)  != (int)s->last_bpp
-        ||  offsets_changed) {
-        if (vga_resize_graphic(s, disp_width, height, v) != VINF_SUCCESS)
-            return;
+        ||  offsets_changed)
+    {
+        int rc = vga_resize_graphic(s, disp_width, height, v);
+        if (rc != VINF_SUCCESS)  /* Return any rc, particularly VINF_VGA_RESIZE_IN_PROGRESS, to the caller. */
+            return rc;
         full_update = 1;
     }
@@ -1900 +1922 @@
      * programming of the virtual hardware ports. Just return.
      */
-    if (bwidth == 0) return;
+    if (bwidth == 0) return VINF_SUCCESS;
 #endif /* VBOX */ 
     y_start = -1;
@@ -1957 +1979 @@
             vga_draw_line(s, d, s->vram_ptr + addr, width);
 #else /* VBOX */
-            if (s->pvExtVRAMHC != s->pDrv->pu8Data) /* Only if external VRAM was not setup. */
+            if (s->fRenderVRAM)
                 vga_draw_line(s, d, s->CTXSUFF(vram_ptr) + addr, width);
 #endif /* VBOX */
@@ -2007 +2029 @@
     }
     memset(s->invalidated_y_table, 0, ((height + 31) >> 5) * 4);
+#ifdef VBOX
+    return VINF_SUCCESS;
+#endif /* VBOX */
 }
 
@@ -2062 +2087 @@
 void vga_update_display(void)
 {
-#ifdef DEBUG_sunlover
-    LogFlow(("vga_update_display"));
-#endif /* DEBUG_sunlover */
-
     VGAState *s = vga_state;
 #else /* VBOX */
-static void vga_update_display(PVGASTATE s)
-{
+static int vga_update_display(PVGASTATE s)
+{
+    int rc = VINF_SUCCESS;
 #endif /* VBOX */
     int full_update, graphic_mode;
@@ -2112 +2134 @@
         switch(graphic_mode) {
         case GMODE_TEXT:
+#ifdef VBOX
+            rc =
+#endif /* VBOX */
             vga_draw_text(s, full_update);
             break;
         case GMODE_GRAPH:
+#ifdef VBOX
+            rc =
+#endif /* VBOX */
             vga_draw_graphic(s, full_update);
             break;
@@ -2123 +2151 @@
         }
     }
+#ifdef VBOX
+    return rc;
+#endif /* VBOX */
 }
 
@@ -3522 +3553 @@
  * @thread  The emulation thread.
  */
-static DECLCALLBACK(void) vgaDummyResize(PPDMIDISPLAYCONNECTOR pInterface, uint32_t bpp, void *pvVRAM, uint32_t cbLine, uint32_t cx, uint32_t cy)
-{
+static DECLCALLBACK(int) vgaDummyResize(PPDMIDISPLAYCONNECTOR pInterface, uint32_t bpp, void *pvVRAM, uint32_t cbLine, uint32_t cx, uint32_t cy)
+{
+    return VINF_SUCCESS;
 }
 
@@ -3572 +3604 @@
  * @see     PDMIKEYBOARDPORT::pfnUpdateDisplay() for details.
  */
-static DECLCALLBACK(void) vgaPortUpdateDisplay(PPDMIDISPLAYPORT pInterface)
+static DECLCALLBACK(int) vgaPortUpdateDisplay(PPDMIDISPLAYPORT pInterface)
 {
     PVGASTATE pData = IDISPLAYPORT_2_VGASTATE(pInterface);
@@ -3583 +3615 @@
     /* This should be called only in non VBVA mode. */
 
-    vga_update_display(pData);
+    int rc = vga_update_display(pData);
+    if (rc != VINF_SUCCESS)
+        return rc;
 
     if (pData->fHaveDirtyBits)
@@ -3591 +3625 @@
         pData->fHaveDirtyBits = false;
     }
+
+    return VINF_SUCCESS;
 }
 
@@ -3600 +3636 @@
  * @see     PDMIKEYBOARDPORT::pfnUpdateDisplayAll() for details.
  */
-static DECLCALLBACK(void) vgaPortUpdateDisplayAll(PPDMIDISPLAYPORT pInterface)
+static DECLCALLBACK(int) vgaPortUpdateDisplayAll(PPDMIDISPLAYPORT pInterface)
 {
     PVGASTATE pData = IDISPLAYPORT_2_VGASTATE(pInterface);
@@ -3612 +3648 @@
 
     pData->graphic_mode = -1; /* force full update */
-    vga_update_display(pData);
+    return vga_update_display(pData);
 }
 
@@ -3660 +3696 @@
 static DECLCALLBACK(int) vgaPortSnapshot(PPDMIDISPLAYPORT pInterface, void *pvData, size_t cbData, uint32_t *pcx, uint32_t *pcy, size_t *pcbData)
 {
+    /* @todo r=sunlover: replace the method with a direct VRAM rendering like in vgaPortUpdateDisplayRect.  */
     PPDMIDISPLAYCONNECTOR   pConnector;
     PDMIDISPLAYCONNECTOR    Connector;
@@ -3713 +3750 @@
 
     /* make the snapshot. */
-    vga_update_display(pData);
+    int rc = vga_update_display(pData);
+    if (rc != VINF_SUCCESS)
+        return rc;
 
     /* restore */
@@ -3843 +3882 @@
 
     /* Check if there is something to do at all. */
-    if (s->pvExtVRAMHC == s->pDrv->pu8Data)
+    if (!s->fRenderVRAM)
     {
         /* The framebuffer uses the guest VRAM directly. */
 #ifdef DEBUG_sunlover
-        LogFlow(("vgaPortUpdateDisplayRect: nothing to do: s->pvExtVRAMHC %p, s->pDrv->pu8Data %p\n", s->pvExtVRAMHC, s->pDrv->pu8Data));
+        LogFlow(("vgaPortUpdateDisplayRect: nothing to do fRender is false.\n"));
 #endif /* DEBUG_sunlover */
         return;
@@ -3944 +3983 @@
      * This is true because coordinates were verified.
      */
-    pu8Src = s->pvExtVRAMHC? (uint8_t *)s->pvExtVRAMHC: s->vram_ptrHC;
+    pu8Src = s->vram_ptrHC;
     pu8Src += u32OffsetSrc + y * cbLineSrc + x * cbPixelSrc;
 
@@ -3965 +4004 @@
 }
 
-static DECLCALLBACK(int) vgaPortSetupVRAM (PPDMIDISPLAYPORT pInterface, void *pvBuffer, uint32_t cbBuffer)
-{
-    int rc = VINF_SUCCESS;
+static DECLCALLBACK(void) vgaPortSetRenderVRAM(PPDMIDISPLAYPORT pInterface, bool fRender)
+{
     PVGASTATE s = IDISPLAYPORT_2_VGASTATE(pInterface);
-    PPDMDEVINS pDevIns;
-    PVM pVM;
-
-    uint32_t u32OverlayOffset = 0;
-
-    LogFlow(("vgaPortSetupVRAM: pvBuffer = %p, cbBuffer = 0x%08X, s->vram_ptrHC = %p\n", pvBuffer, cbBuffer, s->vram_ptrHC));
-
-    /* Check input values, Main::Display rely on that. */
-    if (ALIGNP(pvBuffer, PAGE_SIZE) != pvBuffer)
-    {
-        LogFlow(("vgaPortSetupVRAM: Not aligned address.\n"));
-        return VERR_INVALID_PARAMETER;
-    }
-
-    pDevIns = s->pDevInsHC;
-    Assert(pDevIns);
-
-    pVM = PDMDevHlpGetVM(pDevIns);
-    Assert(pVM);
-
-    if (s->pvExtVRAMHC != NULL)
-    {
-        if (s->pvExtVRAMHC != s->vram_ptrHC)
-        {
-            /* @todo */
-            AssertMsgFailed(("Too early to call SetupVRAM with external VRAM\n"));
-
-            /* Remove existing overlay mapping. */
-//            MMR3PPhysUnregisterOverlay (pVM, s->GCPhysVRAM, u32OverlayOffset, s->pvExtVRAMHC, s->cbExtVRAM);
-
-            /* Copy the content of the external VRAM to the device VRAM. */
-            memcpy (s->vram_ptrHC + u32OverlayOffset, s->pvExtVRAMHC, s->cbExtVRAM);
-        }
-
-        s->pvExtVRAMHC = NULL;
-        s->cbExtVRAM = 0;
-    }
-
-    if (pvBuffer == NULL)
-    {
-        /* Resetting VRAM to use only vga device allocated memory. */
-        Assert (cbBuffer == 0);
-        return VINF_SUCCESS;
-    }
-
-    if (pvBuffer == s->vram_ptrHC)
-    {
-        /* Caller will use the guest VRAM directly. Do nothing. Ignore cbBuffer. */
-        cbBuffer = 0;
-        rc = VINF_SUCCESS;
-    }
-    else
-    {
-        /* Register new overlay. */
-
-        /* @todo */
-        AssertMsgFailed(("Too early to call SetupVRAM with external VRAM\n"));
-
-        cbBuffer = RT_ALIGN_32(cbBuffer, PAGE_SIZE);
-
-//        rc = MMR3PhysRegisterOverlay(pVM, s->GCPhysVRAM, u32OverlayOffset, pvBuffer, cbBuffer, "FBVRam");
-    }
-
-    if (VBOX_SUCCESS (rc))
-    {
-        s->pvExtVRAMHC = pvBuffer;
-        s->cbExtVRAM = cbBuffer;
-    }
-
-    return rc;
+
+    LogFlow(("vgaPortSetRenderVRAM: fRender = %d\n", fRender));
+
+    s->fRenderVRAM = fRender;
 }
 
@@ -4575 +4547 @@
     pData->Port.pfnDisplayBlt       = vgaPortDisplayBlt;
     pData->Port.pfnUpdateDisplayRect= vgaPortUpdateDisplayRect;
-    pData->Port.pfnSetupVRAM        = vgaPortSetupVRAM;
+    pData->Port.pfnSetRenderVRAM    = vgaPortSetRenderVRAM;
 
 

trunk/src/VBox/Devices/Graphics/DevVGA.h

@@ -281 +281 @@
     uint32_t                    Padding0;   /* May be removed if more data is added */
 
-    /** Size of the buffer*/
-    uint32_t                    cbExtVRAM;
-    /** Address of external video memory buffer overlaying VRAM. */
-    R3PTRTYPE(void *)           pvExtVRAMHC;
-#if HC_ARCH_BITS ==32
-    uint32_t                    Alignment0;
-#endif
+    /** Whether to render the guest VRAM to the framebuffer memory. False only for some LFB modes. */
+    uint32_t                    fRenderVRAM;
 
     /** The PCI device. */