Changeset 51269 in vbox for trunk/src/VBox/Additions

Timestamp:

May 15, 2014 7:22:39 PM (11 years ago)

Author:

vboxsync

Message:

wddm: enable complex topology for CmdVbva

Location:

trunk/src/VBox/Additions/WINNT/Graphics/Video/mp/wddm

Files:

• VBoxMPVidPn.cpp (modified) (8 diffs)
• VBoxMPVidPn.h (modified) (1 diff)
• VBoxMPWddm.cpp (modified) (4 diffs)

trunk/src/VBox/Additions/WINNT/Graphics/Video/mp/wddm/VBoxMPVidPn.cpp

@@ -1406 +1406 @@
     const DXGK_VIDPNTARGETMODESET_INTERFACE *pNewVidPnTargetModeSetInterface;
 
-    Assert(VidPnSourceId == VidPnTargetId);
+    Assert(pDevExt->fCmdVbvaEnabled || VidPnSourceId == VidPnTargetId);
 
     D3DKMDT_HVIDPNSOURCEMODESET hCurVidPnSourceModeSet;
@@ -1446 +1446 @@
         {
             Assert(hNewVidPnTargetModeSet);
-            Assert(VidPnSourceId == VidPnTargetId);
+            Assert(pDevExt->fCmdVbvaEnabled || VidPnSourceId == VidPnTargetId);
 //            if (VidPnSourceId == VidPnTargetId && pCbContext->apPathInfos[VidPnTargetId].enmState == VBOXVIDPNPATHITEM_STATE_PRESENT)
             {
@@ -1537 +1537 @@
     const DXGK_VIDPNSOURCEMODESET_INTERFACE *pNewVidPnSourceModeSetInterface;
 
-    Assert(VidPnSourceId == VidPnTargetId);
+    Assert(pDevExt->fCmdVbvaEnabled || VidPnSourceId == VidPnTargetId);
 
     D3DKMDT_HVIDPNTARGETMODESET hCurVidPnTargetModeSet;
@@ -1577 +1577 @@
         {
             Assert(hNewVidPnSourceModeSet);
-            Assert(VidPnSourceId == VidPnTargetId);
+            Assert(pDevExt->fCmdVbvaEnabled || VidPnSourceId == VidPnTargetId);
 //            if (VidPnSourceId == VidPnTargetId && pCbContext->apPathInfos[VidPnSourceId].enmState == VBOXVIDPNPATHITEM_STATE_PRESENT)
             {
@@ -1741 +1741 @@
 }
 
-static BOOLEAN vboxVidPnIsPathSupported(const D3DKMDT_VIDPN_PRESENT_PATH *pNewVidPnPresentPathInfo)
-{
-    if (pNewVidPnPresentPathInfo->VidPnSourceId != pNewVidPnPresentPathInfo->VidPnTargetId)
+static BOOLEAN vboxVidPnIsPathSupported(PVBOXMP_DEVEXT pDevExt, const D3DKMDT_VIDPN_PRESENT_PATH *pNewVidPnPresentPathInfo)
+{
+    if (!pDevExt->fCmdVbvaEnabled && pNewVidPnPresentPathInfo->VidPnSourceId != pNewVidPnPresentPathInfo->VidPnTargetId)
     {
         LOG(("unsupported source(%d)->target(%d) pair", pNewVidPnPresentPathInfo->VidPnSourceId, pNewVidPnPresentPathInfo->VidPnTargetId));
@@ -1866 +1866 @@
 typedef struct VBOXVIDPNGETPATHSINFO
 {
+    PVBOXMP_DEVEXT pDevExt;
     NTSTATUS Status;
     BOOLEAN fBreakOnDisabled;
     BOOLEAN fDisabledFound;
-    UINT cItems;
-    PVBOXVIDPNPATHITEM paItems;
 } VBOXVIDPNGETPATHSINFO, *PVBOXVIDPNGETPATHSINFO;
 
@@ -1880 +1879 @@
     CONST D3DDDI_VIDEO_PRESENT_SOURCE_ID VidPnSourceId = pNewVidPnPresentPathInfo->VidPnSourceId;
     CONST D3DDDI_VIDEO_PRESENT_TARGET_ID VidPnTargetId = pNewVidPnPresentPathInfo->VidPnTargetId;
-    BOOLEAN fDisabledFound = !vboxVidPnIsPathSupported(pNewVidPnPresentPathInfo);
-    do
-    {
-        if (fDisabledFound)
-        {
-            if (pCbContext->cItems > VidPnSourceId)
-            {
-                pCbContext->paItems[VidPnSourceId].enmState = VBOXVIDPNPATHITEM_STATE_DISABLED;
-            }
-            else
-            {
-                WARN(("cItems(%d) <= VidPnSourceId(%d)", pCbContext->cItems, VidPnSourceId));
-                Status = STATUS_BUFFER_OVERFLOW;
-                break;
-            }
-
-            if (pCbContext->cItems > VidPnTargetId)
-            {
-                pCbContext->paItems[VidPnTargetId].enmState = VBOXVIDPNPATHITEM_STATE_DISABLED;
-            }
-            else
-            {
-                WARN(("cItems(%d) <= VidPnTargetId(%d)", pCbContext->cItems, VidPnTargetId));
-                Status = STATUS_BUFFER_OVERFLOW;
-                break;
-            }
-
-            break;
-        }
-
-        /* VidPnSourceId == VidPnTargetId */
-        Assert(VidPnSourceId == VidPnTargetId);
-        if (pCbContext->cItems > VidPnSourceId)
-        {
-            if (pCbContext->paItems[VidPnSourceId].enmState != VBOXVIDPNPATHITEM_STATE_DISABLED)
-            {
-                Assert(pCbContext->paItems[VidPnSourceId].enmState == VBOXVIDPNPATHITEM_STATE_NOT_EXISTS);
-                pCbContext->paItems[VidPnSourceId].enmState = VBOXVIDPNPATHITEM_STATE_PRESENT;
-            }
-        }
-        else
-        {
-            WARN(("cItems(%d) <= VidPnSource/TargetId(%d)", pCbContext->cItems, VidPnSourceId));
-            Status = STATUS_BUFFER_OVERFLOW;
-            break;
-        }
-    } while (0);
+    BOOLEAN fDisabledFound = !vboxVidPnIsPathSupported(pCbContext->pDevExt, pNewVidPnPresentPathInfo);
 
     pCbContext->fDisabledFound |= fDisabledFound;
@@ -1938 +1891 @@
 /* we currently support only 0 -> 0, 1 -> 1, 2 -> 2 paths, AND 0 -> 0 must be present
  * this routine disables all paths unsupported */
-NTSTATUS vboxVidPnCheckTopology(D3DKMDT_HVIDPNTOPOLOGY hVidPnTopology, const DXGK_VIDPNTOPOLOGY_INTERFACE* pVidPnTopologyInterface, BOOLEAN *pfSupported)
-{
-    VBOXVIDPNPATHITEM aItems[VBOX_VIDEO_MAX_SCREENS];
-    const uint32_t cItems = RT_ELEMENTS(aItems);
+NTSTATUS VBoxVidPnCheckTopology(PVBOXMP_DEVEXT pDevExt, D3DKMDT_HVIDPNTOPOLOGY hVidPnTopology, const DXGK_VIDPNTOPOLOGY_INTERFACE* pVidPnTopologyInterface, BOOLEAN *pfSupported)
+{
     UINT i;
-    for (i = 0; i < cItems; ++i)
-    {
-        aItems[i].enmState = VBOXVIDPNPATHITEM_STATE_NOT_EXISTS;
-    }
     VBOXVIDPNGETPATHSINFO CbContext = {0};
+    CbContext.pDevExt = pDevExt;
     CbContext.Status = STATUS_SUCCESS;
     CbContext.fBreakOnDisabled = FALSE;
     CbContext.fDisabledFound = FALSE;
-    CbContext.cItems = cItems;
-    CbContext.paItems = aItems;
     NTSTATUS Status = vboxVidPnEnumPaths(hVidPnTopology, pVidPnTopologyInterface, vboxVidPnCheckTopologyEnum, &CbContext);
     if (!NT_SUCCESS(Status))

trunk/src/VBox/Additions/WINNT/Graphics/Video/mp/wddm/VBoxMPVidPn.h

@@ -166 +166 @@
 NTSTATUS vboxVidPnCofuncModalityForPath(PVBOXVIDPNCOFUNCMODALITY pCbContext, D3DDDI_VIDEO_PRESENT_SOURCE_ID VidPnSourceId, D3DDDI_VIDEO_PRESENT_TARGET_ID VidPnTargetId);
 
-NTSTATUS vboxVidPnCheckTopology(D3DKMDT_HVIDPNTOPOLOGY hVidPnTopology, const DXGK_VIDPNTOPOLOGY_INTERFACE* pVidPnTopologyInterface, BOOLEAN *pfSupported);
+NTSTATUS VBoxVidPnCheckTopology(PVBOXMP_DEVEXT pDevExt, D3DKMDT_HVIDPNTOPOLOGY hVidPnTopology, const DXGK_VIDPNTOPOLOGY_INTERFACE* pVidPnTopologyInterface, BOOLEAN *pfSupported);
 
 NTSTATUS vboxVidPnPathAdd(D3DKMDT_HVIDPN hVidPn, const DXGK_VIDPN_INTERFACE* pVidPnInterface,

trunk/src/VBox/Additions/WINNT/Graphics/Video/mp/wddm/VBoxMPWddm.cpp

@@ -5053 +5053 @@
     NTSTATUS Status = STATUS_SUCCESS;
 
-    PVBOXMP_DEVEXT pContext = (PVBOXMP_DEVEXT)hAdapter;
+    PVBOXMP_DEVEXT pDevExt = (PVBOXMP_DEVEXT)hAdapter;
     const DXGK_VIDPN_INTERFACE* pVidPnInterface = NULL;
-    Status = pContext->u.primary.DxgkInterface.DxgkCbQueryVidPnInterface(pIsSupportedVidPnArg->hDesiredVidPn, DXGK_VIDPN_INTERFACE_VERSION_V1, &pVidPnInterface);
+    Status = pDevExt->u.primary.DxgkInterface.DxgkCbQueryVidPnInterface(pIsSupportedVidPnArg->hDesiredVidPn, DXGK_VIDPN_INTERFACE_VERSION_V1, &pVidPnInterface);
     if (!NT_SUCCESS(Status))
     {
@@ -5063 +5063 @@
 
 #ifdef VBOXWDDM_DEBUG_VIDPN
-    vboxVidPnDumpVidPn("\n>>>>IS SUPPORTED VidPN : >>>>", pContext, pIsSupportedVidPnArg->hDesiredVidPn, pVidPnInterface, "<<<<<<<<<<<<<<<<<<<<");
+    vboxVidPnDumpVidPn("\n>>>>IS SUPPORTED VidPN : >>>>", pDevExt, pIsSupportedVidPnArg->hDesiredVidPn, pVidPnInterface, "<<<<<<<<<<<<<<<<<<<<");
 #endif
 
@@ -5076 +5076 @@
 
     BOOLEAN fSupported = FALSE;
-    Status = vboxVidPnCheckTopology(hVidPnTopology, pVidPnTopologyInterface, &fSupported);
+    Status = VBoxVidPnCheckTopology(pDevExt, hVidPnTopology, pVidPnTopologyInterface, &fSupported);
     if (!NT_SUCCESS(Status))
     {
-        WARN(("vboxVidPnCheckTopology failed Status()0x%x\n", Status));
+        WARN(("VBoxVidPnCheckTopology failed Status()0x%x\n", Status));
         return Status;
     }
@@ -5265 +5265 @@
 
 #ifdef DEBUG_misha
-    BOOLEAN fSupported = FALSE;
-    Status = vboxVidPnCheckTopology(hVidPnTopology, pVidPnTopologyInterface, &fSupported);
-    if (!NT_SUCCESS(Status))
-    {
-        WARN(("vboxVidPnCheckTopology failed Status()0x%x\n", Status));
-        return Status;
-    }
-
-    Assert(fSupported);
+    {
+        BOOLEAN fSupported = FALSE;
+        Status = VBoxVidPnCheckTopology(pDevExt, hVidPnTopology, pVidPnTopologyInterface, &fSupported);
+        if (!NT_SUCCESS(Status))
+            WARN(("VBoxVidPnCheckTopology failed Status()0x%x\n", Status));
+
+        Assert(fSupported);
+    }
 #endif
     VBOXVIDPNCOFUNCMODALITY CbContext = {0};