Changeset 24053 in vbox

Timestamp:

Oct 23, 2009 6:54:16 PM (15 years ago)

Author:

vboxsync

Message:

2d accel: perform data reset VGA device reset

Location:

trunk/src/VBox/Devices/Graphics

Files:

• DevVGA.h (modified) (2 diffs)
• DevVGA_VBVA.cpp (modified) (3 diffs)
• HGSMI/HGSMIHost.cpp (modified) (5 diffs)

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

@@ -458 +458 @@
 int      VBVAUpdateDisplay (PVGASTATE pVGAState);
 void     VBVAReset (PVGASTATE pVGAState);
+void     HGSMIReset (PHGSMIINSTANCE pIns);
 
 # ifdef VBOX_WITH_VIDEOHWACCEL
@@ -463 +464 @@
 int vbvaVHWAConstruct (PVGASTATE pVGAState);
 int vbvaVHWADisable (PVGASTATE pVGAState);
+int vbvaVHWAReset (PVGASTATE pVGAState);
 
 int vboxVBVASaveStatePrep (PPDMDEVINS pDevIns, PSSMHANDLE pSSM);

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

@@ -945 +945 @@
 }
 
+int vbvaVHWAReset (PVGASTATE pVGAState)
+{
+    /* ensure we have all pending cmds processed and h->g cmds disabled */
+    VBOXVHWACMD *pCmd = vbvaVHWAHHCommandCreate(pVGAState, VBOXVHWACMD_TYPE_DISABLE, 0);
+    Assert(pCmd);
+    if(pCmd)
+    {
+        int rc = vbvaVHWAHHCommandPost(pVGAState, pCmd);
+        Assert(RT_SUCCESS(rc));
+        if(RT_SUCCESS(rc))
+        {
+            rc = pCmd->rc;
+            Assert(RT_SUCCESS(rc));
+            vbvaVHWAHHCommandRelease(pCmd);
+        }
+        return rc;
+    }
+    return VERR_OUT_OF_RESOURCES;
+}
+
 /* @todo call this also on reset? */
 int vbvaVHWADisable (PVGASTATE pVGAState)
@@ -1346 +1366 @@
     VBVACONTEXT *pCtx = (VBVACONTEXT *)HGSMIContext (pVGAState->pHGSMI);
 
+#ifdef VBOX_WITH_VIDEOHWACCEL
+    vbvaVHWAReset (pVGAState);
+#endif
+
+    HGSMIReset (pVGAState->pHGSMI);
+
     if (pCtx)
     {
@@ -1357 +1383 @@
         }
     }
+
 }
 

trunk/src/VBox/Devices/Graphics/HGSMI/HGSMIHost.cpp

@@ -346 +346 @@
 }
 
-
-/* The the guest has finished processing of a buffer previously submitted by the host.
- * Called from HGSMI_IO_HOST write handler.
- * @thread EMT
- */
-void HGSMIHostWrite (HGSMIINSTANCE *pIns,
-                     HGSMIOFFSET offBuffer)
-{
-    LogFlowFunc(("pIns %p offBuffer 0x%x\n", pIns, offBuffer));
-
+static bool hgsmiProcessHostCmdCompletion (HGSMIINSTANCE *pIns,
+                     HGSMIOFFSET offBuffer,
+                     bool bCompleteFirst)
+{
     VM_ASSERT_EMT(pIns->pVM);
 
@@ -369 +363 @@
             Assert(pEntry->fl == (HGSMI_F_HOST_FIFO_ALLOCATED | HGSMI_F_HOST_FIFO_READ));
 
-            if (pEntry->offBuffer == offBuffer)
+            if (bCompleteFirst || pEntry->offBuffer == offBuffer)
             {
                 break;
@@ -386 +380 @@
         LogFlowFunc(("read list entry: %p.\n", pEntry));
 
-        Assert(pEntry);
+        Assert(pEntry || bCompleteFirst);
 
         if (pEntry)
@@ -409 +403 @@
             hgsmiHostCommandFreeCallback(pEntry);
 #endif
-        }
-        else
-        {
-            hgsmiFIFOUnlock(pIns);
+            return true;
+        }
+
+        hgsmiFIFOUnlock(pIns);
+        if(!bCompleteFirst)
             LogRel(("HGSMI[%s]: ignored invalid write to the host FIFO: 0x%08X!!!\n", pIns->pszName, offBuffer));
-        }
-    }
+    }
+    return false;
+}
+
+/* The the guest has finished processing of a buffer previously submitted by the host.
+ * Called from HGSMI_IO_HOST write handler.
+ * @thread EMT
+ */
+void HGSMIHostWrite (HGSMIINSTANCE *pIns,
+                     HGSMIOFFSET offBuffer)
+{
+    LogFlowFunc(("pIns %p offBuffer 0x%x\n", pIns, offBuffer));
+
+    hgsmiProcessHostCmdCompletion (pIns, offBuffer, false);
 }
 
@@ -1531 +1538 @@
 }
 
+void HGSMIReset (PHGSMIINSTANCE pIns)
+{
+    while(hgsmiProcessHostCmdCompletion (pIns, 0, true)) {}
+
+    HGSMIHeapSetupUnitialized (&pIns->hostHeap);
+}
+
 void HGSMIDestroy (PHGSMIINSTANCE pIns)
 {