Changeset 27286 in vbox for trunk/src/VBox/Additions/WINNT

Timestamp:

Mar 11, 2010 4:01:26 PM (15 years ago)

Author:

vboxsync

Message:

wddm: bugfix

Location:

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

Files:

• Helper.cpp (modified) (4 diffs)
• VBoxVideo.cpp (modified) (1 diff)
• VBoxVideo.h (modified) (2 diffs)
• wddm/VBoxVideoShgsmi.cpp (modified) (1 diff)
• wddm/VBoxVideoVdma.cpp (modified) (1 diff)
• wddm/VBoxVideoWddm.cpp (modified) (12 diffs)
• wddm/VBoxVideoWddm.h (modified) (1 diff)

trunk/src/VBox/Additions/WINNT/Graphics/Miniport/Helper.cpp

@@ -124 +124 @@
     if (RT_FAILURE(rc))
     {
-#ifndef DEBUG_misha
         dprintf(("VBoxVideo::vboxLikesVideoMode: ERROR allocating request, rc = %Rrc\n", rc));
-#else
-        /* @todo: fixme: remove this ifdef*/
-#endif
         /* Most likely the VBoxGuest driver is not loaded.
          * To get at least the video working, report the mode as supported.
@@ -151 +147 @@
         VbglGRFree(&req->header);
     }
-#ifndef DEBUG_misha
+
     dprintf(("VBoxVideo::vboxLikesVideoMode: width: %d, height: %d, bpp: %d -> %s\n", width, height, bpp, (bRC == 1) ? "OK" : "FALSE"));
-#else
-        /* @todo: fixme: remove this ifdef*/
-#endif
 
     return bRC;
@@ -164 +157 @@
     ULONG retHeight = 0;
 
-#ifndef DEBUG_misha
     dprintf(("VBoxVideo::vboxGetHeightReduction\n"));
-#endif
 
     VMMDevGetHeightReductionRequest *req = NULL;
@@ -173 +164 @@
     if (RT_FAILURE(rc))
     {
-#ifndef DEBUG_misha
         dprintf(("VBoxVideo::vboxGetHeightReduction: ERROR allocating request, rc = %Rrc\n", rc));
-#endif
     }
     else

trunk/src/VBox/Additions/WINNT/Graphics/Miniport/VBoxVideo.cpp

@@ -1175 +1175 @@
                      xres, yres, bpp));
     }
-#if defined(LOG_ENABLED) && !defined(DEBUG_misha)
+#if defined(LOG_ENABLED)
     {
         int i;

trunk/src/VBox/Additions/WINNT/Graphics/Miniport/VBoxVideo.h

@@ -600 +600 @@
         /* clear the visibility info fo the current primary */
         pOldPrimaryInfo->bVisible = FALSE;
+        pOldPrimaryInfo->bAssigned = FALSE;
         Assert(pOldPrimaryInfo->VidPnSourceId == srcId);
-        pOldPrimaryInfo->VidPnSourceId = ~0;
     }
 
@@ -608 +608 @@
         PVBOXWDDM_ALLOCATION_SHAREDPRIMARYSURFACE pPrimaryInfo = VBOXWDDM_ALLOCATION_BODY(pAllocation, VBOXWDDM_ALLOCATION_SHAREDPRIMARYSURFACE);
         pPrimaryInfo->bVisible = FALSE;
+        Assert(pPrimaryInfo->VidPnSourceId == srcId);
         pPrimaryInfo->VidPnSourceId = srcId;
+        pPrimaryInfo->bAssigned = TRUE;
     }
 

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

@@ -182 +182 @@
     int rc = VINF_SUCCESS;
 
-    PVBOXSHGSMIHEADER pCur = (PVBOXSHGSMIHEADER)HGSMIOffsetToPointer (&pHeap->area, offCmd);
+    PVBOXSHGSMIHEADER pCur = (PVBOXSHGSMIHEADER)HGSMIBufferDataFromOffset (&pHeap->area, offCmd);
     Assert(pCur);
     if (pCur)

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

@@ -256 +256 @@
 void vboxVdmaCBufDrSubmit (PDEVICE_EXTENSION pDevExt, PVBOXVDMAINFO pInfo, PVBOXVDMACBUF_DR pDr)
 {
-    VBoxSHGSMICommandSubmitAsynchIrq (&pInfo->CmdHeap, pDr, vboxVdmaCBufDrCompletionIrq, pDevExt, 0);
+    VBoxSHGSMICommandSubmitAsynchIrq (&pInfo->CmdHeap, pDr, vboxVdmaCBufDrCompletionIrq, pDevExt, VBOXSHGSMI_FLAG_GH_ASYNCH_FORCE);
 }
 

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

@@ -1229 +1229 @@
     if (pCreateDevice->Flags.SystemDevice)
         pDevice->enmType = VBOXWDDM_DEVICE_TYPE_SYSTEM;
-    else
-    {
-        AssertBreakpoint(); /* we do not support custom contexts for now */
-        drprintf((__FUNCTION__ ": we do not support custom devices for now, hAdapter (0x%x)\n", hAdapter));
-    }
+//    else
+//    {
+//        AssertBreakpoint(); /* we do not support custom contexts for now */
+//        drprintf((__FUNCTION__ ": we do not support custom devices for now, hAdapter (0x%x)\n", hAdapter));
+//    }
 
     pDevice->pAdapter = pContext;
@@ -1249 +1249 @@
     PAGED_CODE();
 
+    switch (pAllocation->enmType)
+    {
+        case VBOXWDDM_ALLOC_TYPE_STD_SHAREDPRIMARYSURFACE:
+        {
+            PVBOXWDDM_ALLOCATION_SHAREDPRIMARYSURFACE pAlloc = VBOXWDDM_ALLOCATION_BODY(pAllocation, VBOXWDDM_ALLOCATION_SHAREDPRIMARYSURFACE);
+            if (pAlloc->bAssigned)
+            {
+                /* @todo: do we need to notify host? */
+                vboxWddmAssignPrimary(pDevExt, &pDevExt->aSources[pAlloc->VidPnSourceId], NULL, pAlloc->VidPnSourceId);
+            }
+            break;
+        }
+        default:
+            break;
+    }
     vboxWddmMemFree(pAllocation);
     return STATUS_SUCCESS;
@@ -1388 +1403 @@
     dfprintf(("==> "__FUNCTION__ ", context(0x%x)\n", hAdapter));
 
-    vboxVDbgBreakF();
+    vboxVDbgBreakFv();
 
     NTSTATUS Status = STATUS_SUCCESS;
@@ -1478 +1493 @@
     dfprintf(("==> "__FUNCTION__ ", context(0x%x)\n", hAdapter));
 
-    vboxVDbgBreakF();
+    vboxVDbgBreakFv();
 
     NTSTATUS Status = STATUS_SUCCESS;
@@ -1667 +1682 @@
     VBOXVDMACMDBUF_INFO BufInfo = {0};
 
-    Assert(pSubmitCommand->DmaBufferSegmentId);
+    Assert(!pSubmitCommand->DmaBufferSegmentId);
 
     /* the DMA command buffer is located in system RAM, the host will need to pick it from there */
@@ -1735 +1750 @@
         case DXGK_OPERATION_TRANSFER:
         {
-            PVBOXWDDM_ALLOCATION pAllocation = (PVBOXWDDM_ALLOCATION)pBuildPagingBuffer->Transfer.hAllocation;
+            pBuildPagingBuffer->pDmaBuffer = (uint8_t*)pBuildPagingBuffer->pDmaBuffer + VBOXVDMACMD_SIZE(VBOXVDMACMD_DMA_BPB_TRANSFER);
             break;
         }
         case DXGK_OPERATION_FILL:
+        {
+            pBuildPagingBuffer->pDmaBuffer = (uint8_t*)pBuildPagingBuffer->pDmaBuffer + VBOXVDMACMD_SIZE(VBOXVDMACMD_DMA_BPB_FILL);
             break;
+        }
         case DXGK_OPERATION_DISCARD_CONTENT:
+        {
+            AssertBreakpoint();
             break;
+        }
         default:
+        {
             drprintf((__FUNCTION__": unsupported op (%d)\n", pBuildPagingBuffer->Operation));
             AssertBreakpoint();
             break;
+        }
     }
 
@@ -1995 +2018 @@
     D3DKMDT_2DREGION *pResolutions;
     VBoxWddmGetModesTable(pDevExt, /* PDEVICE_EXTENSION DeviceExtension */
-            true, /* bool bRebuildTable*/
+            false, /* bool bRebuildTable*/
             &pModes, /* VIDEO_MODE_INFORMATION ** ppModes*/
             &cModes, /* uint32_t * pcModes */
@@ -2060 +2083 @@
             CbContext.pEnumCofuncModalityArg = pEnumCofuncModalityArg;
             VBoxWddmGetModesTable(pContext, /* PDEVICE_EXTENSION DeviceExtension */
-                    true, /* bool bRebuildTable*/
+                    false, /* bool bRebuildTable*/
                     &CbContext.pModes, /* VIDEO_MODE_INFORMATION ** ppModes*/
                     &CbContext.cModes, /* uint32_t * pcModes */
@@ -2315 +2338 @@
     D3DKMDT_2DREGION *pResolutions;
     VBoxWddmGetModesTable(pDevExt, /* PDEVICE_EXTENSION DeviceExtension */
-            true, /* bool bRebuildTable*/
+            false, /* bool bRebuildTable*/
             &pModes, /* VIDEO_MODE_INFORMATION ** ppModes*/
             &cModes, /* uint32_t * pcModes */
@@ -2472 +2495 @@
     dfprintf(("==> "__FUNCTION__ ", hDevice(0x%x)\n", hDevice));
 
-    vboxVDbgBreakF();
+    vboxVDbgBreakFv();
 
     NTSTATUS Status = STATUS_SUCCESS;
@@ -2644 +2667 @@
                     if (vboxWddmPixFormatConversionSupported(pSrcAlloc->u.SurfInfo.format, pDstAlloc->u.SurfInfo.format))
                     {
-                        memset(pPresent->pPatchLocationListOut, 0, 2*sizeof (D3DDDI_PATCHLOCATIONLIST));
+                        memset(pPresent->pPatchLocationListOut, 0, 3*sizeof (D3DDDI_PATCHLOCATIONLIST));
 //                        pPresent->pPatchLocationListOut->PatchOffset = 0;
-//                        ++pPresent->pPatchLocationListOut;
+                        ++pPresent->pPatchLocationListOut;
                         pPresent->pPatchLocationListOut->PatchOffset = VBOXVDMACMD_BODY_FIELD_OFFSET(UINT, VBOXVDMACMD_DMA_PRESENT_BLT, offSrc);
-                        pPresent->pPatchLocationListOut->AllocationIndex = 0;
+                        pPresent->pPatchLocationListOut->AllocationIndex = DXGK_PRESENT_SOURCE_INDEX;
                         ++pPresent->pPatchLocationListOut;
                         pPresent->pPatchLocationListOut->PatchOffset = VBOXVDMACMD_BODY_FIELD_OFFSET(UINT, VBOXVDMACMD_DMA_PRESENT_BLT, offDst);
-                        pPresent->pPatchLocationListOut->AllocationIndex = 1;
+                        pPresent->pPatchLocationListOut->AllocationIndex = DXGK_PRESENT_DESTINATION_INDEX;
                         ++pPresent->pPatchLocationListOut;
 
@@ -2783 +2806 @@
     if (pCreateContext->Flags.SystemContext)
         pContext->enmType = VBOXWDDM_CONTEXT_TYPE_SYSTEM;
-    else
-    {
-        AssertBreakpoint(); /* we do not support custom contexts for now */
-        drprintf((__FUNCTION__ ", we do not support custom contexts for now, hDevice (0x%x)\n", hDevice));
-    }
+//    else
+//    {
+//        AssertBreakpoint(); /* we do not support custom contexts for now */
+//        drprintf((__FUNCTION__ ", we do not support custom contexts for now, hDevice (0x%x)\n", hDevice));
+//    }
 
     pCreateContext->hContext = pContext;

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

@@ -91 +91 @@
 //    VBOXVIDEOOFFSET offAddress;
     BOOLEAN bVisible;
+    BOOLEAN bAssigned;
 } VBOXWDDM_ALLOCATION_SHAREDPRIMARYSURFACE, *PVBOXWDDM_ALLOCATION_SHAREDPRIMARYSURFACE;