Changeset 60369 in vbox

Timestamp:

Apr 7, 2016 12:14:52 PM (9 years ago)

Author:

vboxsync

Message:

DevVGA: handle VBVACAPS_USE_VBVA_ONLY, make sure that VBVA pause is applied correctly when loading saved state.

Location:

trunk/src/VBox/Devices/Graphics

Files:

• DevVGA.cpp (modified) (4 diffs)
• DevVGA.h (modified) (1 diff)
• DevVGA_VBVA.cpp (modified) (1 diff)

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

@@ -1148 +1148 @@
             pThis->pDrv->pfnLFBModeChange(pThis->pDrv, (val & VBE_DISPI_ENABLED) != 0);
 #ifdef VBOX_WITH_HGSMI
-            VBVAPause(pThis, (val & VBE_DISPI_ENABLED) == 0);
+            VBVAOnVBEChanged(pThis);
 #endif /* VBOX_WITH_HGSMI */
 
@@ -5234 +5234 @@
     AssertRC(rc);
 
-    /* This method only works if the VGA device is in a VBE mode. */
-    if ((pThis->vbe_regs[VBE_DISPI_INDEX_ENABLE] & VBE_DISPI_ENABLED) == 0)
+    /* This method only works if the VGA device is in a VBE mode or not paused VBVA mode.
+     * VGA modes are reported to the caller by returning VERR_INVALID_STATE.
+     *
+     * If VBE_DISPI_ENABLED is set, then it is a VBE or VBE compatible VBVA mode. Both of them can be handled.
+     *
+     * If VBE_DISPI_ENABLED is clear, then it is either a VGA mode or a VBVA mode set by guest additions
+     * which have VBVACAPS_USE_VBVA_ONLY capability.
+     * When VBE_DISPI_ENABLED is being cleared and VBVACAPS_USE_VBVA_ONLY is not set (i.e. guest wants a VGA mode),
+     * then VBVAOnVBEChanged makes sure that VBVA is paused.
+     * That is a not paused VBVA means that the video mode can be handled even if VBE_DISPI_ENABLED is clear.
+     */
+    if (   (pThis->vbe_regs[VBE_DISPI_INDEX_ENABLE] & VBE_DISPI_ENABLED) == 0
+        && VBVAIsPaused(pThis))
     {
         PDMCritSectLeave(&pThis->CritSect);
@@ -5639 +5650 @@
 #ifdef VBOX_WITH_HGSMI
     PVGASTATE pThis = PDMINS_2_DATA(pDevIns, PVGASTATE);
-    VBVAPause(pThis, (pThis->vbe_regs[VBE_DISPI_INDEX_ENABLE] & VBE_DISPI_ENABLED) == 0);
     rc = vboxVBVALoadStateDone(pDevIns, pSSM);
     AssertRCReturn(rc, rc);
@@ -5646 +5656 @@
     AssertRCReturn(rc, rc);
 # endif
+    /* Now update the current VBVA state which depends on VBE registers. vboxVBVALoadStateDone cleared the state. */
+    VBVAOnVBEChanged(pThis);
 #endif
 #ifdef VBOX_WITH_VMSVGA

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

@@ -682 +682 @@
 void     VBVAReset (PVGASTATE pVGAState);
 void     VBVAPause (PVGASTATE pVGAState, bool fPause);
-
+void     VBVAOnVBEChanged(PVGASTATE pVGAState);
+
+bool VBVAIsPaused(PVGASTATE pVGAState);
 bool VBVAIsEnabled(PVGASTATE pVGAState);
 

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

@@ -2765 +2765 @@
 }
 
+bool VBVAIsPaused(PVGASTATE pVGAState)
+{
+    if (pVGAState && pVGAState->pHGSMI)
+    {
+        const VBVACONTEXT *pCtx = (VBVACONTEXT *)HGSMIContext(pVGAState->pHGSMI);
+        if (pCtx && pCtx->cViews)
+        {
+            /* If VBVA is enabled at all. */
+            const VBVAVIEW *pView = &pCtx->aViews[0];
+            if (pView->vbva.guest.pVBVA)
+                return pCtx->fPaused;
+        }
+    }
+    /* VBVA is disabled. */
+    return true;
+}
+
+void VBVAOnVBEChanged(PVGASTATE pVGAState)
+{
+    /* The guest does not depend on host handling the VBE registers. */
+    if (pVGAState->fGuestCaps & VBVACAPS_USE_VBVA_ONLY)
+    {
+        return;
+    }
+
+    VBVAPause(pVGAState, (pVGAState->vbe_regs[VBE_DISPI_INDEX_ENABLE] & VBE_DISPI_ENABLED) == 0);
+}
+
 void VBVAReset (PVGASTATE pVGAState)
 {