Changeset 26794 in vbox for trunk

Timestamp:

Feb 25, 2010 1:18:57 PM (15 years ago)

Author:

vboxsync

Message:

wddm: more impl + bugfix

Location:

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

Files:

• VBoxVideo.h (modified) (2 diffs)
• VBoxVideoHGSMI.cpp (modified) (3 diffs)
• wddm/VBoxVideoVidPn.cpp (modified) (1 diff)
• wddm/VBoxVideoVidPn.h (modified) (2 diffs)
• wddm/VBoxVideoWddm.cpp (modified) (9 diffs)
• wddm/VBoxVideoWddm.h (modified) (1 diff)

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

@@ -167 +167 @@
 
            BOOLEAN bVBoxVideoSupported;        /* TRUE if VBoxVideo extensions, including DualView, are supported by the host. */
-
+#ifndef VBOXWDDM
            int cDisplays;                      /* Number of displays. */
-
+#endif
            ULONG cbVRAM;                       /* The VRAM size. */
 
@@ -581 +581 @@
 }
 
+DECLINLINE(VOID) vboxWddmAssignPrimary(PDEVICE_EXTENSION pDevExt, PVBOXWDDM_SOURCE pSource, PVBOXWDDM_ALLOCATION pAllocation, D3DDDI_VIDEO_PRESENT_SOURCE_ID srcId)
+{
+    if (pSource->pAllocation == pAllocation)
+        return;
+
+    if (pSource->pAllocation)
+    {
+        PVBOXWDDM_ALLOCATION pOldAlloc = pSource->pAllocation;
+        PVBOXWDDM_ALLOCATION_SHAREDPRIMARYSURFACE pOldPrimaryInfo = VBOXWDDM_ALLOCATION_BODY(pOldAlloc, VBOXWDDM_ALLOCATION_SHAREDPRIMARYSURFACE);
+        /* clear the visibility info fo the current primary */
+        pOldPrimaryInfo->bVisible = FALSE;
+        Assert(pOldPrimaryInfo->VidPnSourceId == srcId);
+        pOldPrimaryInfo->VidPnSourceId = ~0;
+    }
+
+    if (pAllocation)
+    {
+        PVBOXWDDM_ALLOCATION_SHAREDPRIMARYSURFACE pPrimaryInfo = VBOXWDDM_ALLOCATION_BODY(pAllocation, VBOXWDDM_ALLOCATION_SHAREDPRIMARYSURFACE);
+        pPrimaryInfo->bVisible = FALSE;
+        pPrimaryInfo->VidPnSourceId = srcId;
+    }
+
+    pSource->pAllocation = pAllocation;
+}
+
 #endif
 

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

@@ -712 +712 @@
     PrimaryExtension->u.primary.ulVbvaEnabled            = 0;
     PrimaryExtension->u.primary.bVBoxVideoSupported      = FALSE;
+#ifndef VBOXWDDM
     PrimaryExtension->u.primary.cDisplays                = 1;
+#endif
     PrimaryExtension->u.primary.cbVRAM                   = AdapterMemorySize;
     PrimaryExtension->u.primary.cbMiniportHeap           = 0;
@@ -899 +901 @@
 #else
             /* simply store the number of monitors, we will deal with VidPN stuff later */
-            PrimaryExtension->u.primary.cDisplays = cDisplays;
+            PrimaryExtension->cSources = cDisplays;
 #endif
         }
@@ -1175 +1177 @@
 static int vboxVBVACreateChannelContexts(PDEVICE_EXTENSION PrimaryExtension, VBVA_CHANNELCONTEXTS ** ppContext)
 {
+#ifndef VBOXWDDM
     uint32_t cDisplays = (uint32_t)PrimaryExtension->u.primary.cDisplays;
+#else
+    uint32_t cDisplays = (uint32_t)PrimaryExtension->cSources;
+#endif
     const size_t size = RT_OFFSETOF(VBVA_CHANNELCONTEXTS, aContexts[cDisplays]);
     VBVA_CHANNELCONTEXTS * pContext = (VBVA_CHANNELCONTEXTS*)VBoxVideoCmnMemAllocNonPaged(PrimaryExtension, size, MEM_TAG);

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

@@ -893 +893 @@
     return Status;
 }
+
+NTSTATUS vboxVidPnSetupSourceInfo(struct _DEVICE_EXTENSION* pDevExt, PVBOXWDDM_SOURCE pSource, CONST D3DKMDT_VIDPN_SOURCE_MODE* pVidPnSourceModeInfo, PVBOXWDDM_ALLOCATION pAllocation)
+{
+    vboxWddmAssignPrimary(pDevExt, pSource, pAllocation, pVidPnSourceModeInfo->Id);
+    return STATUS_SUCCESS;
+}
+
+NTSTATUS vboxVidPnCommitSourceMode(struct _DEVICE_EXTENSION* pDevExt, CONST D3DKMDT_VIDPN_SOURCE_MODE* pVidPnSourceModeInfo, PVBOXWDDM_ALLOCATION pAllocation)
+{
+    Assert(pVidPnSourceModeInfo->Id < pDevExt->cSources);
+    if (pVidPnSourceModeInfo->Id < pDevExt->cSources)
+    {
+        PVBOXWDDM_SOURCE pSource = &pDevExt->aSources[pVidPnSourceModeInfo->Id];
+        return vboxVidPnSetupSourceInfo(pDevExt, pSource, pVidPnSourceModeInfo, pAllocation);
+    }
+
+    drprintf((__FUNCTION__": invalid mode id (%d), cSources(%d)\n", pVidPnSourceModeInfo->Id, pDevExt->cSources));
+    return STATUS_INVALID_PARAMETER;
+}
+
+NTSTATUS vboxVidPnCommitSourceModeForSrcId(struct _DEVICE_EXTENSION* pDevExt, const D3DKMDT_HVIDPN hDesiredVidPn, const DXGK_VIDPN_INTERFACE* pVidPnInterface, D3DDDI_VIDEO_PRESENT_SOURCE_ID srcId, PVBOXWDDM_ALLOCATION pAllocation)
+{
+    D3DKMDT_HVIDPNSOURCEMODESET hCurVidPnSourceModeSet;
+    const DXGK_VIDPNSOURCEMODESET_INTERFACE *pCurVidPnSourceModeSetInterface;
+
+    NTSTATUS Status = pVidPnInterface->pfnAcquireSourceModeSet(hDesiredVidPn,
+                srcId,
+                &hCurVidPnSourceModeSet,
+                &pCurVidPnSourceModeSetInterface);
+    Assert(Status == STATUS_SUCCESS);
+    if (Status == STATUS_SUCCESS)
+    {
+        CONST D3DKMDT_VIDPN_SOURCE_MODE* pPinnedVidPnSourceModeInfo;
+        Status = pCurVidPnSourceModeSetInterface->pfnAcquirePinnedModeInfo(hCurVidPnSourceModeSet, &pPinnedVidPnSourceModeInfo);
+        Assert(Status == STATUS_SUCCESS);
+        if (Status == STATUS_SUCCESS)
+        {
+            Assert(pPinnedVidPnSourceModeInfo);
+            if (pPinnedVidPnSourceModeInfo)
+            {
+                Status = vboxVidPnCommitSourceMode(pDevExt, pPinnedVidPnSourceModeInfo, pAllocation);
+                Assert(Status == STATUS_SUCCESS);
+                if (Status != STATUS_SUCCESS)
+                    drprintf((__FUNCTION__": vboxVidPnCommitSourceMode failed Status(0x%x)\n", Status));
+                /* release */
+                pCurVidPnSourceModeSetInterface->pfnReleaseModeInfo(hCurVidPnSourceModeSet, pPinnedVidPnSourceModeInfo);
+            }
+            else
+                drprintf((__FUNCTION__": no pPinnedVidPnSourceModeInfo available for source id (%d)\n", srcId));
+        }
+        else
+            drprintf((__FUNCTION__": pfnAcquirePinnedModeInfo failed Status(0x%x)\n", Status));
+
+        pVidPnInterface->pfnReleaseSourceModeSet(hDesiredVidPn, hCurVidPnSourceModeSet);
+    }
+    else
+    {
+        drprintf((__FUNCTION__": pfnAcquireSourceModeSet failed Status(0x%x)\n", Status));
+    }
+
+    return Status;
+}
+
+DECLCALLBACK(BOOLEAN) vboxVidPnCommitPathEnum(struct _DEVICE_EXTENSION* pDevExt, const D3DKMDT_HVIDPN hDesiredVidPn, const DXGK_VIDPN_INTERFACE* pVidPnInterface,
+        D3DKMDT_HVIDPNTOPOLOGY hVidPnTopology, const DXGK_VIDPNTOPOLOGY_INTERFACE* pVidPnTopologyInterface,
+        const D3DKMDT_VIDPN_PRESENT_PATH *pVidPnPresentPathInfo, PVOID pContext)
+{
+    NTSTATUS Status = STATUS_SUCCESS;
+    PVBOXVIDPNCOMMIT pCommitInfo = (PVBOXVIDPNCOMMIT)pContext;
+
+    if (pCommitInfo->pCommitVidPnArg->AffectedVidPnSourceId == D3DDDI_ID_ALL
+            || pCommitInfo->pCommitVidPnArg->AffectedVidPnSourceId == pVidPnPresentPathInfo->VidPnSourceId)
+    {
+        Status = vboxVidPnCommitSourceModeForSrcId(pDevExt, hDesiredVidPn, pVidPnInterface, pVidPnPresentPathInfo->VidPnSourceId, (PVBOXWDDM_ALLOCATION)pCommitInfo->pCommitVidPnArg->hPrimaryAllocation);
+        Assert(Status == STATUS_SUCCESS);
+        if (Status != STATUS_SUCCESS)
+            drprintf((__FUNCTION__": vboxVidPnCommitSourceModeForSrcId failed Status(0x%x)\n", Status));
+    }
+
+    pCommitInfo->Status = Status;
+    pVidPnTopologyInterface->pfnReleasePathInfo(hVidPnTopology, pVidPnPresentPathInfo);
+    return Status == STATUS_SUCCESS;
+}

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

@@ -47 +47 @@
     uint32_t cResolutions;
     D3DKMDT_2DREGION *pResolutions;
-}VBOXVIDPNCOFUNCMODALITY, *PVBOXVIDPNCOFUNCMODALITY;
+} VBOXVIDPNCOFUNCMODALITY, *PVBOXVIDPNCOFUNCMODALITY;
+
+typedef struct VBOXVIDPNCOMMIT
+{
+    NTSTATUS Status;
+    CONST DXGKARG_COMMITVIDPN* pCommitVidPnArg;
+} VBOXVIDPNCOMMIT, *PVBOXVIDPNCOMMIT;
 
 /* !!!NOTE: The callback is responsible for releasing the path */
@@ -80 +86 @@
         const D3DKMDT_VIDPN_TARGET_MODE *pNewVidPnTargetModeInfo, PVOID pContext);
 
+DECLCALLBACK(BOOLEAN) vboxVidPnCommitPathEnum(struct _DEVICE_EXTENSION* pDevExt, const D3DKMDT_HVIDPN hDesiredVidPn, const DXGK_VIDPN_INTERFACE* pVidPnInterface,
+        D3DKMDT_HVIDPNTOPOLOGY hVidPnTopology, const DXGK_VIDPNTOPOLOGY_INTERFACE* pVidPnTopologyInterface,
+        const D3DKMDT_VIDPN_PRESENT_PATH *pNewVidPnPresentPathInfo, PVOID pContext);
+
+NTSTATUS vboxVidPnCommitSourceModeForSrcId(struct _DEVICE_EXTENSION* pDevExt, const D3DKMDT_HVIDPN hDesiredVidPn, const DXGK_VIDPN_INTERFACE* pVidPnInterface, D3DDDI_VIDEO_PRESENT_SOURCE_ID srcId, struct VBOXWDDM_ALLOCATION *pAllocation);
+
 NTSTATUS vboxVidPnEnumPaths(struct _DEVICE_EXTENSION* pDevExt, const D3DKMDT_HVIDPN hDesiredVidPn, const DXGK_VIDPN_INTERFACE* pVidPnInterface,
         D3DKMDT_HVIDPNTOPOLOGY hVidPnTopology, const DXGK_VIDPNTOPOLOGY_INTERFACE* pVidPnTopologyInterface,

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

@@ -141 +141 @@
         pView->u32ViewIndex     = pPrimaryInfo->VidPnSourceId;
         pView->u32ViewOffset    = offVram;
-        pView->u32ViewSize      = vboxWddmVramReportedSize(pDevExt)/pDevExt->u.primary.cDisplays;
+        pView->u32ViewSize      = vboxWddmVramReportedSize(pDevExt)/pDevExt->cSources;
 
         pView->u32MaxScreenSize = pView->u32ViewSize;
@@ -812 +812 @@
                 {
                     drprintf(("VBoxVideoWddm: using HGSMI\n"));
-                    *NumberOfVideoPresentSources = pContext->u.primary.cDisplays;
-                    *NumberOfChildren = pContext->u.primary.cDisplays;
+                    *NumberOfVideoPresentSources = pContext->cSources;
+                    *NumberOfChildren = pContext->cSources;
                     dprintf(("VBoxVideoWddm: sources(%d), children(%d)\n", *NumberOfVideoPresentSources, *NumberOfChildren));
                 }
@@ -1022 +1022 @@
 
     dfprintf(("==> "__FUNCTION__ ", context(0x%x)\n", MiniportDeviceContext));
-    for (int i = 0; i < pDevExt->u.primary.cDisplays; ++i)
+    Assert(ChildRelationsSize == (pDevExt->cSources + 1)*sizeof(DXGK_CHILD_DESCRIPTOR));
+    for (UINT i = 0; i < pDevExt->cSources; ++i)
     {
         ChildRelations[i].ChildDeviceType = TypeVideoOutput;
@@ -1836 +1837 @@
             if (Status == STATUS_SUCCESS && bSupported)
             {
-                for (int id = 0; id < pContext->u.primary.cDisplays; id++)
+                for (UINT id = 0; id < pContext->cSources; ++id)
                 {
                     D3DKMDT_HVIDPNSOURCEMODESET hNewVidPnSourceModeSet;
@@ -1867 +1868 @@
                 if (Status == STATUS_SUCCESS && bSupported)
                 {
-                    for (int id = 0; id < pContext->u.primary.cDisplays; id++)
+                    for (UINT id = 0; id < pContext->cSources; ++id)
                     {
                         D3DKMDT_HVIDPNTARGETMODESET hNewVidPnTargetModeSet;
@@ -1911 +1912 @@
     dfprintf(("<== "__FUNCTION__ ", status(0x%x), context(0x%x)\n", Status, hAdapter));
 
-    return STATUS_SUCCESS;
+    return Status;
 }
 
@@ -2161 +2162 @@
     dfprintf(("<== "__FUNCTION__ ", status(0x%x), context(0x%x)\n", Status, hAdapter));
 
-    return STATUS_NOT_IMPLEMENTED;
+    return Status;
 }
 
@@ -2188 +2189 @@
         if (pSetVidPnSourceAddress->hAllocation)
         {
-            pSource->pAllocation = (PVBOXWDDM_ALLOCATION)pSetVidPnSourceAddress->hAllocation;
             pAllocation = (PVBOXWDDM_ALLOCATION)pSetVidPnSourceAddress->hAllocation;
+            vboxWddmAssignPrimary(pDevExt, pSource, pAllocation, pSetVidPnSourceAddress->VidPnSourceId);
         }
         else
@@ -2285 +2286 @@
     )
 {
-
-    return STATUS_NOT_IMPLEMENTED;
+    dfprintf(("==> "__FUNCTION__ ", context(0x%x)\n", hAdapter));
+
+    PDEVICE_EXTENSION pDevExt = (PDEVICE_EXTENSION)hAdapter;
+
+    const DXGK_VIDPN_INTERFACE* pVidPnInterface = NULL;
+    NTSTATUS Status = pDevExt->u.primary.DxgkInterface.DxgkCbQueryVidPnInterface(pCommitVidPnArg->hFunctionalVidPn, DXGK_VIDPN_INTERFACE_VERSION_V1, &pVidPnInterface);
+    if (Status == STATUS_SUCCESS)
+    {
+        if (pCommitVidPnArg->AffectedVidPnSourceId != D3DDDI_ID_ALL)
+        {
+            Status = vboxVidPnCommitSourceModeForSrcId(
+                    pDevExt,
+                    pCommitVidPnArg->hFunctionalVidPn, pVidPnInterface,
+                    pCommitVidPnArg->AffectedVidPnSourceId, (PVBOXWDDM_ALLOCATION)pCommitVidPnArg->hPrimaryAllocation);
+            Assert(Status == STATUS_SUCCESS);
+            if (Status != STATUS_SUCCESS)
+                drprintf((__FUNCTION__ ": vboxVidPnCommitSourceModeForSrcId failed Status(0x%x)\n", Status));
+        }
+        else
+        {
+            /* clear all current primaries */
+            for (UINT i = 0; i < pDevExt->cSources; ++i)
+            {
+                vboxWddmAssignPrimary(pDevExt, &pDevExt->aSources[i], NULL, i);
+            }
+
+            D3DKMDT_HVIDPNTOPOLOGY hVidPnTopology;
+            const DXGK_VIDPNTOPOLOGY_INTERFACE* pVidPnTopologyInterface;
+            NTSTATUS Status = pVidPnInterface->pfnGetTopology(pCommitVidPnArg->hFunctionalVidPn, &hVidPnTopology, &pVidPnTopologyInterface);
+            Assert(Status == STATUS_SUCCESS);
+            if (Status == STATUS_SUCCESS)
+            {
+                VBOXVIDPNCOMMIT CbContext = {0};
+                CbContext.pCommitVidPnArg = pCommitVidPnArg;
+                Status = vboxVidPnEnumPaths(pDevExt, pCommitVidPnArg->hFunctionalVidPn, pVidPnInterface,
+                            hVidPnTopology, pVidPnTopologyInterface,
+                            vboxVidPnCommitPathEnum, &CbContext);
+                Assert(Status == STATUS_SUCCESS);
+                if (Status == STATUS_SUCCESS)
+                {
+                        Status = CbContext.Status;
+                        Assert(Status == STATUS_SUCCESS);
+                        if (Status != STATUS_SUCCESS)
+                            drprintf((__FUNCTION__ ": vboxVidPnAdjustSourcesTargetsCallback failed Status(0x%x)\n", Status));
+                }
+                else
+                    drprintf((__FUNCTION__ ": vboxVidPnEnumPaths failed Status(0x%x)\n", Status));
+            }
+            else
+                drprintf((__FUNCTION__ ": pfnGetTopology failed Status(0x%x)\n", Status));
+        }
+    }
+    else
+        drprintf((__FUNCTION__ ": DxgkCbQueryVidPnInterface failed Status(0x%x)\n", Status));
+
+    dfprintf(("<== "__FUNCTION__ ", status(0x%x), context(0x%x)\n", Status, hAdapter));
+
+    return Status;
 }
 

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

@@ -81 +81 @@
 #define VBOXWDDM_ALLOCATION_HEAD(_pb) ((VBOXWDDM_ALLOCATION*)((uint8_t *)(_pb) - VBOXWDDM_ALLOCATION_HEADSIZE()))
 
+
+
+
+
 typedef struct VBOXWDDM_ALLOCATION_SHAREDPRIMARYSURFACE
 {