Changeset 31687 in vbox for trunk/src/VBox/Additions/WINNT/Graphics/Miniport/wddm/VBoxVideoWddm.cpp

Timestamp:

Aug 16, 2010 10:59:01 AM (14 years ago)

Author:

vboxsync

Message:

wddm: multimonitor support

File:

• trunk/src/VBox/Additions/WINNT/Graphics/Miniport/wddm/VBoxVideoWddm.cpp (modified) (20 diffs)

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

@@ -87 +87 @@
 }
 
-NTSTATUS vboxWddmGhDisplayPostInfoScreen (PDEVICE_EXTENSION pDevExt, PVBOXWDDM_ALLOCATION pAllocation)
+NTSTATUS vboxWddmGhDisplayPostInfoScreen (PDEVICE_EXTENSION pDevExt, PVBOXWDDM_ALLOCATION pAllocation, POINT * pVScreenPos)
 {
     VBOXVIDEOOFFSET offVram = pAllocation->offVram;
@@ -105 +105 @@
 
         pScreen->u32ViewIndex    = pAllocation->SurfDesc.VidPnSourceId;
-        pScreen->i32OriginX      = 0;
-        pScreen->i32OriginY      = 0;
+        pScreen->i32OriginX      = pVScreenPos->x;
+        pScreen->i32OriginY      = pVScreenPos->y;
         pScreen->u32StartOffset  = 0; //(uint32_t)offVram; /* we pretend the view is located at the start of each framebuffer */
         pScreen->u32LineSize     = pAllocation->SurfDesc.pitch;
@@ -169 +169 @@
 }
 
+NTSTATUS vboxWddmGhDisplayUpdateScreenPos(PDEVICE_EXTENSION pDevExt, PVBOXWDDM_SOURCE pSource, POINT *pVScreenPos)
+{
+    if (pSource->VScreenPos.x == pVScreenPos->x
+            && pSource->VScreenPos.y == pVScreenPos->y)
+        return STATUS_SUCCESS;
+
+    pSource->VScreenPos = *pVScreenPos;
+
+    PVBOXWDDM_ALLOCATION pAllocation = VBOXWDDM_FB_ALLOCATION(pSource);
+    NTSTATUS Status = vboxWddmGhDisplayPostInfoScreen(pDevExt, pAllocation, &pSource->VScreenPos);
+    Assert(Status == STATUS_SUCCESS);
+    return Status;
+}
 
 NTSTATUS vboxWddmGhDisplaySetInfo(PDEVICE_EXTENSION pDevExt, PVBOXWDDM_SOURCE pSource)
 {
-
-#ifndef VBOXWDDM_RENDER_FROM_SHADOW
-    PVBOXWDDM_ALLOCATION pAllocation = pSource->pPrimaryAllocation;
-#else
-    PVBOXWDDM_ALLOCATION pAllocation = pSource->pShadowAllocation;
-#endif
+    PVBOXWDDM_ALLOCATION pAllocation = VBOXWDDM_FB_ALLOCATION(pSource);
     VBOXVIDEOOFFSET offVram = vboxWddmValidatePrimary(pAllocation);
     Assert(offVram != VBOXVIDEOOFFSET_VOID);
@@ -194 +202 @@
         if (Status == STATUS_SUCCESS)
         {
-            Status = vboxWddmGhDisplayPostInfoScreen(pDevExt, pAllocation);
+            Status = vboxWddmGhDisplayPostInfoScreen(pDevExt, pAllocation, &pSource->VScreenPos);
             Assert(Status == STATUS_SUCCESS);
             if (Status != STATUS_SUCCESS)
@@ -1699 +1707 @@
     DXGKARG_DESCRIBEALLOCATION*  pDescribeAllocation)
 {
-//    dfprintf(("==> "__FUNCTION__ ", hAdapter(0x%x)\n", hAdapter));
+    dfprintf(("==> "__FUNCTION__ ", hAdapter(0x%x)\n", hAdapter));
 
     vboxVDbgBreakFv();
@@ -1712 +1720 @@
     pDescribeAllocation->PrivateDriverFormatAttribute = 0;
 
-//    dfprintf(("<== "__FUNCTION__ ", hAdapter(0x%x)\n", hAdapter));
+    dfprintf(("<== "__FUNCTION__ ", hAdapter(0x%x)\n", hAdapter));
 
     return STATUS_SUCCESS;
@@ -2058 +2066 @@
 }
 
-static void vboxWddmSubmitBltCmd(PDEVICE_EXTENSION pDevExt, PVBOXWDDM_CONTEXT pContext, PVBOXWDDM_DMA_PRESENT_BLT pBlt)
+static void vboxWddmSubmitBltCmd(PDEVICE_EXTENSION pDevExt, PVBOXWDDM_SOURCE pSource, PVBOXWDDM_CONTEXT pContext, PVBOXWDDM_DMA_PRESENT_BLT pBlt)
 {
     PVBOXVDMAPIPE_CMD_RECTSINFO pRectsCmd = (PVBOXVDMAPIPE_CMD_RECTSINFO)vboxVdmaGgCmdCreate(&pDevExt->u.primary.Vdma.DmaGg, VBOXVDMAPIPE_CMD_TYPE_RECTSINFO, RT_OFFSETOF(VBOXVDMAPIPE_CMD_RECTSINFO, ContextsRects.UpdateRects.aRects[pBlt->DstRects.UpdateRects.cRects]));
@@ -2066 +2074 @@
         pRectsCmd->pContext = pContext;
         memcpy(&pRectsCmd->ContextsRects, &pBlt->DstRects, RT_OFFSETOF(VBOXVDMAPIPE_RECTS, UpdateRects.aRects[pBlt->DstRects.UpdateRects.cRects]));
+        vboxWddmRectTranslate(&pRectsCmd->ContextsRects.ContextRect, pSource->VScreenPos.x, pSource->VScreenPos.y);
+        for (UINT i = 0; i < pRectsCmd->ContextsRects.UpdateRects.cRects; ++i)
+        {
+            vboxWddmRectTranslate(&pRectsCmd->ContextsRects.UpdateRects.aRects[i], pSource->VScreenPos.x, pSource->VScreenPos.y);
+        }
         NTSTATUS tmpStatus = vboxVdmaGgCmdSubmit(&pDevExt->u.primary.Vdma.DmaGg, &pRectsCmd->Hdr);
         Assert(tmpStatus == STATUS_SUCCESS);
@@ -2111 +2124 @@
             vboxWddmCheckUpdateShadowAddress(pDevExt, pSource, pPrivateData->SrcAllocInfo.segmentIdAlloc, pPrivateData->SrcAllocInfo.offAlloc);
             PVBOXWDDM_DMA_PRESENT_RENDER_FROM_SHADOW pRFS = (PVBOXWDDM_DMA_PRESENT_RENDER_FROM_SHADOW)pPrivateData;
+            vboxWddmRectTranslate(&pRFS->rect, pSource->VScreenPos.x, pSource->VScreenPos.y);
             uint32_t cDMACmdsOutstanding = ASMAtomicReadU32(&pDevExt->cDMACmdsOutstanding);
             if (!cDMACmdsOutstanding)
@@ -2163 +2177 @@
                                     rect = pBlt->DstRects.ContextRect;
 
+                                vboxWddmRectTranslate(&rect, pSource->VScreenPos.x, pSource->VScreenPos.y);
+
                                 uint32_t cDMACmdsOutstanding = ASMAtomicReadU32(&pDevExt->cDMACmdsOutstanding);
                                 if (!cDMACmdsOutstanding)
@@ -2171 +2187 @@
                                     VBOXVBVA_OP_WITHLOCK_ATDPC(ReportDirtyRect, pDevExt, &pSource->Vbva, &rect);
                                 }
-                                vboxWddmSubmitBltCmd(pDevExt, pContext, pBlt);
+                                vboxWddmSubmitBltCmd(pDevExt, pSource, pContext, pBlt);
                                 break;
                             }
@@ -2180 +2196 @@
                                 if (pSrcAlloc->fRcFlags.RenderTarget)
                                 {
-                                    vboxWddmSubmitBltCmd(pDevExt, pContext, pBlt);
+                                    vboxWddmSubmitBltCmd(pDevExt, pSource, pContext, pBlt);
                                 }
                                 break;
@@ -2222 +2238 @@
             {
                 PVBOXWDDM_ALLOCATION pAlloc = pPrivateData->SrcAllocInfo.pAlloc;
+                VBOXWDDM_SOURCE *pSource = &pDevExt->aSources[pPrivateData->SrcAllocInfo.srcId];
                 pRectsCmd->pContext = pContext;
                 RECT r;
-                r.top = 0;
-                r.left = 0;
-                r.right = pAlloc->SurfDesc.width;
-                r.bottom = pAlloc->SurfDesc.height;
+                r.left = pSource->VScreenPos.x;
+                r.top = pSource->VScreenPos.y;
+                r.right = pAlloc->SurfDesc.width + pSource->VScreenPos.x;
+                r.bottom = pAlloc->SurfDesc.height + pSource->VScreenPos.y;
                 pRectsCmd->ContextsRects.ContextRect = r;
                 pRectsCmd->ContextsRects.UpdateRects.cRects = 1;
@@ -2843 +2860 @@
                 Status = STATUS_SUCCESS;
                 break;
+            case VBOXESC_SCREENLAYOUT:
+            {
+                Assert(pEscape->PrivateDriverDataSize >= sizeof (VBOXDISPIFESCAPE_SCREENLAYOUT));
+                if (pEscape->PrivateDriverDataSize >= sizeof (VBOXDISPIFESCAPE_SCREENLAYOUT))
+                {
+                    PVBOXDISPIFESCAPE_SCREENLAYOUT pLo = (PVBOXDISPIFESCAPE_SCREENLAYOUT)pEscapeHdr;
+                    Assert(pLo->ScreenLayout.cScreens <= (UINT)pDevExt->u.primary.cDisplays);
+                    for (UINT i = 0; i < pLo->ScreenLayout.cScreens; ++i)
+                    {
+                        PVBOXSCREENLAYOUT_ELEMENT pEl = &pLo->ScreenLayout.aScreens[i];
+                        Assert(pEl->VidPnSourceId < (UINT)pDevExt->u.primary.cDisplays);
+                        if (pEl->VidPnSourceId < (UINT)pDevExt->u.primary.cDisplays)
+                        {
+                            PVBOXWDDM_SOURCE pSource = &pDevExt->aSources[pEl->VidPnSourceId];
+                            NTSTATUS tmpStatus = vboxWddmGhDisplayUpdateScreenPos(pDevExt, pSource, &pEl->pos);
+                            Assert(tmpStatus == STATUS_SUCCESS);
+                        }
+                    }
+                    Status = STATUS_SUCCESS;
+                    break;
+                }
+                else
+                {
+                    drprintf((__FUNCTION__": VBOXESC_SCREENLAYOUT: incorrect buffer size (%d) < sizeof (VBOXDISPIFESCAPE_SCREENLAYOUT) (%d)\n",
+                            pEscape->PrivateDriverDataSize, sizeof (VBOXDISPIFESCAPE_SCREENLAYOUT)));
+                    AssertBreakpoint();
+                    Status = STATUS_INVALID_PARAMETER;
+                }
+            }
             case VBOXESC_REINITVIDEOMODES:
                 VBoxWddmInvalidateModesTable(pDevExt);
@@ -2925 +2971 @@
     PAGED_CODE();
 
-//    dfprintf(("==> "__FUNCTION__ ", context(0x%x)\n", hAdapter));
+    dfprintf(("==> "__FUNCTION__ ", context(0x%x)\n", hAdapter));
 
     vboxVDbgBreakFv();
@@ -3016 +3062 @@
     pIsSupportedVidPnArg->IsVidPnSupported = bSupported;
 
-//    dfprintf(("<== "__FUNCTION__ ", status(0x%x), context(0x%x)\n", Status, hAdapter));
+    dfprintf(("<== "__FUNCTION__ ", status(0x%x), context(0x%x)\n", Status, hAdapter));
 
     return Status;
@@ -3133 +3179 @@
     PAGED_CODE();
 
-//    dfprintf(("==> "__FUNCTION__ ", context(0x%x)\n", hAdapter));
+    dfprintf(("==> "__FUNCTION__ ", context(0x%x)\n", hAdapter));
 
     vboxVDbgBreakFv();
@@ -3180 +3226 @@
         drprintf((__FUNCTION__ ": DxgkCbQueryVidPnInterface failed Status(0x%x)\n", Status));
 
-//    dfprintf(("<== "__FUNCTION__ ", status(0x%x), context(0x%x)\n", Status, hAdapter));
+    dfprintf(("<== "__FUNCTION__ ", status(0x%x), context(0x%x)\n", Status, hAdapter));
 
     return Status;
@@ -3485 +3531 @@
     DXGKARG_GETSCANLINE*  pGetScanLine)
 {
-//    dfprintf(("==> "__FUNCTION__ ", hAdapter(0x%x)\n", hAdapter));
+    dfprintf(("==> "__FUNCTION__ ", hAdapter(0x%x)\n", hAdapter));
 
     PDEVICE_EXTENSION pDevExt = (PDEVICE_EXTENSION)hAdapter;
@@ -3513 +3559 @@
     }
 
-//    dfprintf(("<== "__FUNCTION__ ", hAdapter(0x%x)\n", hAdapter));
+    dfprintf(("<== "__FUNCTION__ ", hAdapter(0x%x)\n", hAdapter));
 
     return STATUS_SUCCESS;