Changeset 22136 in vbox for trunk/src/VBox/Additions/WINNT/Graphics/Display

Timestamp:

Aug 10, 2009 2:05:23 PM (15 years ago)

Author:

vboxsync

Message:

video hw accel: fix cmd loss

Location:

trunk/src/VBox/Additions/WINNT/Graphics/Display

Files:

• dd.c (modified) (1 diff)
• driver.h (modified) (3 diffs)
• screen.c (modified) (1 diff)
• vbox.c (modified) (9 diffs)

trunk/src/VBox/Additions/WINNT/Graphics/Display/dd.c

@@ -1585 +1585 @@
         ASMAtomicIncU32(&pCurrDesc->cPendingFlipsCurr);
         ASMAtomicIncU32(&pTargDesc->cPendingFlipsTarg);
+#ifdef DEBUG
+        ASMAtomicIncU32(&pCurrDesc->cFlipsCurr);
+        ASMAtomicIncU32(&pTargDesc->cFlipsTarg);
+#endif
 
         if(pTargDesc->UpdatedMemRegion.bValid)

trunk/src/VBox/Additions/WINNT/Graphics/Display/driver.h

@@ -108 +108 @@
     volatile uint32_t cPendingFlipsCurr;
     volatile uint32_t cPendingFlipsTarg;
+#ifdef DEBUG
+    volatile uint64_t cFlipsCurr;
+    volatile uint64_t cFlipsTarg;
+#endif
 //    uint32_t cBitsPerPixel;
     bool bHidden;
@@ -200 +204 @@
 
     HVBOXVIDEOHGSMI hMpHGSMI; /* context handler passed to miniport HGSMI callbacks */
+    PFNVBOXVIDEOHGSMIPOSTCOMMAND pfnHGSMIGHCommandPost; /* called to post the guest command (offset) to the host */
     PFNVBOXVIDEOHGSMICOMPLETION pfnHGSMICommandComplete; /* called to complete the command we receive from the miniport */
     PFNVBOXVIDEOHGSMICOMMANDS   pfnHGSMIRequestCommands; /* called to requests the commands posted to us from the host */
@@ -225 +230 @@
 
 #ifdef VBOX_WITH_HGSMI
-#define VBE_DISPI_IOPORT_INDEX          0x01CE
-#define VBE_DISPI_IOPORT_DATA           0x01CF
-#define VBE_DISPI_INDEX_VBVA_GUEST      0xc
+//#define VBE_DISPI_IOPORT_INDEX          0x01CE
+//#define VBE_DISPI_IOPORT_DATA           0x01CF
+//#define VBE_DISPI_INDEX_VBVA_GUEST      0xc
 #endif /* VBOX_WITH_HGSMI */
 

trunk/src/VBox/Additions/WINNT/Graphics/Display/screen.c

@@ -123 +123 @@
 
             ppdev->hMpHGSMI = Callbacks.hContext;
+            ppdev->pfnHGSMIGHCommandPost = Callbacks.pfnHGSMIGHCommandPost;
             ppdev->pfnHGSMICommandComplete = Callbacks.pfnCompletionHandler;
             ppdev->pfnHGSMIRequestCommands = Callbacks.pfnRequestCommandsHandler;

trunk/src/VBox/Additions/WINNT/Graphics/Display/vbox.c

@@ -345 +345 @@
     HGSMIOFFSET offBuffer = HGSMIHeapBufferOffset (&ppdev->hgsmiDisplayHeap, p);
 
-    ASMOutU16 (VBE_DISPI_IOPORT_INDEX, VBE_DISPI_INDEX_VBVA_GUEST);
-    ASMOutU32 (VBE_DISPI_IOPORT_DATA, offBuffer);
+    ppdev->pfnHGSMIGHCommandPost(ppdev->hMpHGSMI, offBuffer);
+//    ASMOutU16 (VBE_DISPI_IOPORT_INDEX, VBE_DISPI_INDEX_VBVA_GUEST);
+//    ASMOutU32 (VBE_DISPI_IOPORT_DATA, offBuffer);
 }
 
@@ -757 +758 @@
         default:
         {
+                Assert(0);
             vboxVBVAHostCommandComplete(ppdev, pCmd);
         }
@@ -764 +766 @@
 void vboxVHWACommandCheckHostCmds(PPDEV ppdev)
 {
-    VBVAHOSTCMD * pCmd;
+    VBVAHOSTCMD * pCmd, * pNextCmd;
     int rc = ppdev->pfnHGSMIRequestCommands(ppdev->hMpHGSMI, HGSMI_CH_VBVA, &pCmd);
+    Assert(RT_SUCCESS(rc));
     if(RT_SUCCESS(rc))
     {
-        for(; pCmd; pCmd = pCmd->u.pNext)
-        {
+        for(;pCmd; pCmd = pNextCmd)
+        {
+                pNextCmd = pCmd->u.pNext;
             vboxVBVAHostCommandHanlder(ppdev, pCmd);
         }
@@ -784 +788 @@
     pCmd->Flags |= VBOXVHWACMD_FLAG_GH_ASYNCH_EVENT;
     vboxHGSMIBufferSubmit (ppdev, pCmd);
-
+    //TODO: dbg
+#if 0
     if(!(ASMAtomicReadU32((volatile uint32_t *)&pCmd->Flags)  & VBOXVHWACMD_FLAG_HG_ASYNCH))
     {
@@ -790 +795 @@
         EngSetEvent(pEvent);
     }
+#endif
 }
 
@@ -823 +829 @@
 
     vboxHGSMIBufferSubmit (ppdev, pCmd);
-
+    //TODO: dbg
+#if 0
     if(!(pCmd->Flags & VBOXVHWACMD_FLAG_HG_ASYNCH))
     {
@@ -829 +836 @@
         pfnCompletion(ppdev, pCmd, pContext);
     }
+#endif
 }
 
@@ -844 +852 @@
 
     vboxHGSMIBufferSubmit (ppdev, pCmd);
-
+    //TODO: dbg
+#if 0
     if(!(pCmd->Flags & VBOXVHWACMD_FLAG_HG_ASYNCH)
             || pCmd->Flags & VBOXVHWACMD_FLAG_HG_ASYNCH_RETURNED)
@@ -851 +860 @@
         vboxVHWAFreeCmdCompletion(ppdev, pCmd, NULL);
     }
+#endif
 }