Changeset 30973 in vbox for trunk/src/VBox/Additions/WINNT/Graphics/Miniport/wddm

Timestamp:

Jul 21, 2010 5:32:17 PM (14 years ago)

Author:

vboxsync

Message:

wddm/2d: bugfixes

Location:

trunk/src/VBox/Additions/WINNT/Graphics/Miniport/wddm

Files:

• VBoxVideoVdma.cpp (modified) (1 diff)
• VBoxVideoVhwa.cpp (modified) (2 diffs)
• VBoxVideoWddm.cpp (modified) (4 diffs)
• VBoxVideoWddm.h (modified) (1 diff)

trunk/src/VBox/Additions/WINNT/Graphics/Miniport/wddm/VBoxVideoVdma.cpp

@@ -525 +525 @@
                         {
                             uint32_t * pvU32Mem = (uint32_t*)(pvMem + (ir * pAlloc->SurfDesc.pitch) + (pRect->left * bytestPP));
-                            uint32_t cRaw = (pRect->right - pRect->left) * bytestPP;
+                            uint32_t cRaw = pRect->right - pRect->left;
                             Assert(pRect->left >= 0);
                             Assert(pRect->right <= (LONG)pAlloc->SurfDesc.width);

trunk/src/VBox/Additions/WINNT/Graphics/Miniport/wddm/VBoxVideoVhwa.cpp

@@ -84 +84 @@
 #endif
 
+void vboxVhwaCommandCheckCompletion(PDEVICE_EXTENSION pDevExt)
+{
+    NTSTATUS Status = vboxWddmCallIsr(pDevExt);
+    Assert(Status == STATUS_SUCCESS);
+}
+
 VBOXVHWACMD* vboxVhwaCommandCreate(PDEVICE_EXTENSION pDevExt, D3DDDI_VIDEO_PRESENT_SOURCE_ID srcId, VBOXVHWACMD_TYPE enmCmd, VBOXVHWACMD_LENGTH cbCmd)
 {
+    vboxVhwaCommandCheckCompletion(pDevExt);
 #ifdef VBOXVHWA_WITH_SHGSMI
     VBOXVHWACMD* pHdr = (VBOXVHWACMD*)VBoxSHGSMICommandAlloc(&pDevExt->u.primary.hgsmiAdapterHeap,
@@ -307 +314 @@
 int vboxVhwaDisable(PDEVICE_EXTENSION pDevExt, D3DDDI_VIDEO_PRESENT_SOURCE_ID srcId)
 {
+    vboxVhwaCommandCheckCompletion(pDevExt);
+
     int rc = VERR_GENERAL_FAILURE;
     VBOXVHWACMD* pCmd;

trunk/src/VBox/Additions/WINNT/Graphics/Miniport/wddm/VBoxVideoWddm.cpp

@@ -890 +890 @@
         {
             vboxSHGSMIListCat(&pDevExt->VhwaCmdList, &VhwaCmdList);
+            bNeedDpc = TRUE;
         }
 
@@ -910 +911 @@
             Assert(flags == 0);
 #endif
+        }
+
+        if (bNeedDpc)
+        {
             BOOLEAN bDpcQueued = pDevExt->u.primary.DxgkInterface.DxgkCbQueueDpc(pDevExt->u.primary.DxgkInterface.DeviceHandle);
             Assert(bDpcQueued);
@@ -1980 +1985 @@
 }
 
-#ifdef VBOXWDDM_RENDER_FROM_SHADOW
 typedef struct VBOXWDDM_SHADOW_UPDATE_COMPLETION
 {
@@ -2025 +2029 @@
     return Status;
 }
-#endif
+
+typedef struct VBOXWDDM_CALL_ISR
+{
+    PDEVICE_EXTENSION pDevExt;
+    ULONG MessageNumber;
+} VBOXWDDM_CALL_ISR, *PVBOXWDDM_CALL_ISR;
+
+static BOOLEAN vboxWddmCallIsrCb(PVOID Context)
+{
+    PVBOXWDDM_CALL_ISR pdc = (PVBOXWDDM_CALL_ISR)Context;
+    return DxgkDdiInterruptRoutine(pdc->pDevExt, pdc->MessageNumber);
+}
+
+NTSTATUS vboxWddmCallIsr(PDEVICE_EXTENSION pDevExt)
+{
+    VBOXWDDM_CALL_ISR context;
+    context.pDevExt = pDevExt;
+    context.MessageNumber = 0;
+    BOOLEAN bRet;
+    NTSTATUS Status = pDevExt->u.primary.DxgkInterface.DxgkCbSynchronizeExecution(
+            pDevExt->u.primary.DxgkInterface.DeviceHandle,
+            vboxWddmCallIsrCb,
+            &context,
+            0, /* IN ULONG MessageNumber */
+            &bRet);
+    Assert(Status == STATUS_SUCCESS);
+    return Status;
+}
 
 static void vboxWddmSubmitBltCmd(PDEVICE_EXTENSION pDevExt, PVBOXWDDM_CONTEXT pContext, PVBOXWDDM_DMA_PRESENT_BLT pBlt)

trunk/src/VBox/Additions/WINNT/Graphics/Miniport/wddm/VBoxVideoWddm.h

@@ -50 +50 @@
 
 NTSTATUS vboxWddmDmaCmdNotifyCompletion(PDEVICE_EXTENSION pDevExt, struct VBOXWDDM_CONTEXT *pContext, UINT SubmissionFenceId);
+NTSTATUS vboxWddmCallIsr(PDEVICE_EXTENSION pDevExt);
 
 /* allocation */