Changeset 28379 in vbox

Timestamp:

Apr 15, 2010 5:14:16 PM (15 years ago)

Author:

vboxsync

Message:

dev/VGA: avoid extra resizes when HGSMI & VBVA is used (for now enabled only when Wddm driver is isnatalled in the guest)

Location:

trunk/src/VBox/Devices/Graphics

Files:

• DevVGA.cpp (modified) (1 diff)
• DevVGA.h (modified) (2 diffs)
• DevVGA_VBVA.cpp (modified) (1 diff)
• DevVGA_VDMA.cpp (modified) (3 diffs)

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

@@ -2126 +2126 @@
     const unsigned cBits = s->get_bpp(s);
 
-    /* Take into account the programmed start address (in DWORDs) of the visible screen. */
-    int rc = s->pDrv->pfnResize(s->pDrv, cBits, s->CTX_SUFF(vram_ptr) + s->start_addr * 4, s->line_offset, cx, cy);
+    int rc;
+#ifdef VBOXVDMA
+    /* do not do pfnResize in case VBVA is on since all mode changes are poerofmed over VBVA
+     * we are checking for VDMA state here to ensure this code works only for WDDM driver,
+     * although we should avoid calling pfnResize for XPDM as well, since pfnResize is actually an extra resize
+     * event and generally only pfnVBVAxxx calls should be used with HGSMI + VBVA
+     *
+     * The reason for doing this for WDDM driver only now is to avoid regressions of the current code */
+    PVBOXVDMAHOST pVdma = s->pVdma;
+    if (pVdma && vboxVDMAIsEnabled(pVdma))
+        rc = VINF_SUCCESS;
+    else
+#endif
+    {
+        /* Take into account the programmed start address (in DWORDs) of the visible screen. */
+        rc = s->pDrv->pfnResize(s->pDrv, cBits, s->CTX_SUFF(vram_ptr) + s->start_addr * 4, s->line_offset, cx, cy);
+    }
 
     /* last stuff */

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

@@ -470 +470 @@
 int      VBVAUpdateDisplay (PVGASTATE pVGAState);
 void     VBVAReset (PVGASTATE pVGAState);
+
+bool VBVAIsEnabled(PVGASTATE pVGAState);
+
 /* @return host-guest flags that were set on reset
  * this allows the caller to make further cleaning when needed,
@@ -494 +497 @@
 void vboxVDMAControl(PVBOXVDMAHOST pVdma, PVBOXVDMA_CTL pCmd);
 void vboxVDMACommand(PVBOXVDMAHOST pVdma, PVBOXVDMACBUF_DR pCmd);
+bool vboxVDMAIsEnabled(PVBOXVDMAHOST pVdma);
 # endif /* VBOXVDMA */
 

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

@@ -525 +525 @@
     pVGAState->pDrv->pfnVBVADisable (pVGAState->pDrv, uScreenId);
     return VINF_SUCCESS;
+}
+
+bool VBVAIsEnabled(PVGASTATE pVGAState)
+{
+    PHGSMIINSTANCE pHGSMI = pVGAState->pHGSMI;
+    if (pHGSMI)
+    {
+        VBVACONTEXT *pCtx = (VBVACONTEXT *)HGSMIContext(pHGSMI);
+        if (pCtx)
+        {
+            if (pCtx->cViews)
+            {
+                VBVAVIEW * pView = &pCtx->aViews[0];
+                if (pView->pVBVA)
+                    return true;
+            }
+        }
+    }
+    return false;
 }
 

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

@@ -87 +87 @@
     PHGSMIINSTANCE pHgsmi;
     PVGASTATE pVGAState;
+    bool bEnabled;
     VBOXVDMAPIPE_CMD_POOL CmdPool;
 } VBOXVDMAHOST, *PVBOXVDMAHOST;
@@ -780 +781 @@
     {
         case VBOXVDMA_CTL_TYPE_ENABLE:
+            pVdma->bEnabled = true;
             pCmd->i32Result = VINF_SUCCESS;
             break;
         case VBOXVDMA_CTL_TYPE_DISABLE:
+            pVdma->bEnabled = false;
             pCmd->i32Result = VINF_SUCCESS;
             break;
@@ -853 +856 @@
 }
 
+bool vboxVDMAIsEnabled(PVBOXVDMAHOST pVdma)
+{
+    return pVdma->bEnabled;
+}