Changeset 64085 in vbox

Timestamp:

Sep 28, 2016 3:31:56 PM (8 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

111026

Message:

3D: Skip VBVA_SCREEN_F_DISABLED flag for targets disabled by PM, bugref:8387

Location:

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

Files:

• VBoxMPVidPn.cpp (modified) (2 diffs)
• VBoxMPWddm.cpp (modified) (3 diffs)

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

@@ -2350 +2350 @@
 
     PVBOXWDDM_SOURCE pSource = &paSources[VidPnSourceId];
-    pSource->bBlankedByPowerOff = bPathPowerTransition ? pAllocation == NULL : 0;
+    NTSTATUS Status;
+
+    if (bPathPowerTransition)
+    {
+        RTRECTSIZE PinnedModeSize;
+        bool bHasPinnedMode;
+
+        Status = vboxVidPnQueryPinnedSourceMode(hDesiredVidPn, pVidPnInterface, VidPnSourceId, &PinnedModeSize);
+        bHasPinnedMode = Status == STATUS_SUCCESS && PinnedModeSize.cx > 0 && PinnedModeSize.cy > 0;
+        pSource->bBlankedByPowerOff = !bHasPinnedMode;
+
+        LOG(("Path power transition: srcId %d goes blank %d", VidPnSourceId, pSource->bBlankedByPowerOff));
+    }
 
     VBOXWDDM_TARGET_ITER Iter;
@@ -2367 +2379 @@
     VBoxVidPnStSourceCleanup(paSources, VidPnSourceId, paTargets, (uint32_t)VBoxCommonFromDeviceExt(pDevExt)->cDisplays);
 
-    NTSTATUS Status = pVidPnInterface->pfnAcquireSourceModeSet(hDesiredVidPn,
+    Status = pVidPnInterface->pfnAcquireSourceModeSet(hDesiredVidPn,
                 VidPnSourceId,
                 &hCurVidPnSourceModeSet,

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

@@ -574 +574 @@
 
     bool fFound = false;
-    bool fPowerOff = false;
     for (int i = 0; i < VBoxCommonFromDeviceExt(pDevExt)->cDisplays; ++i)
     {
@@ -585 +584 @@
         }
 
+        if (pTarget->fBlankedByPowerOff)
+        {
+            LOG(("Skip doing DISABLED request for PowerOff tgt %d", pTarget->u32Id));
+            continue;
+        }
+
         if (pTarget->u8SyncState != VBOXWDDM_HGSYNC_F_SYNCED_ALL)
         {
+            ASMBitSet(aTargetMap, i);
             fFound = true;
-            /* Assume that either all targets are powered off or all are disabled (usually true). */
-            fPowerOff = pTarget->fBlankedByPowerOff;
-        }
-
-        ASMBitSet(aTargetMap, i);
+        }
     }
 
@@ -601 +603 @@
     VBOXWDDM_ALLOC_DATA AllocData;
     VBoxVidPnAllocDataInit(&AllocData, D3DDDI_ID_UNINITIALIZED);
-    NTSTATUS Status = vboxWddmGhDisplaySetInfoNew(pDevExt, &AllocData, aTargetMap, &VScreenPos, 0, fPowerOff);
+    NTSTATUS Status = vboxWddmGhDisplaySetInfoNew(pDevExt, &AllocData, aTargetMap, &VScreenPos, 0, false);
     if (!NT_SUCCESS(Status))
     {