Changeset 63943 in vbox

Timestamp:

Sep 22, 2016 11:41:09 AM (8 years ago)

Author:

vboxsync

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

110829

Message:

3D: Logging in DxgkDdiCommitVidPn improved to view VBOXCMDVBVACTL_TYPE_RESIZE submitted to Host, bugref:8387

Location:

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

Files:

• VBoxMPVbva.cpp (modified) (1 diff)
• VBoxMPVidPn.cpp (modified) (5 diffs)
• VBoxMPVidPn.h (modified) (1 diff)
• VBoxMPWddm.cpp (modified) (3 diffs)

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

@@ -1381 +1381 @@
     if (RT_SUCCESS(rc))
     {
-        memcpy(&pResize->Resize.aEntries[0].aTargetMap, pTargetMap, sizeof (pResize->Resize.aEntries[0].aTargetMap));
+        VBOXCMDVBVA_RESIZE_ENTRY* pEntry = &pResize->Resize.aEntries[0];
+        memcpy(pEntry->aTargetMap, pTargetMap, sizeof (pEntry->aTargetMap));
+        LOG(("[%d] %dx%d, TargetMap0 0x%x, flags 0x%x", 
+            pEntry->Screen.u32ViewIndex, pEntry->Screen.u32Width, pEntry->Screen.u32Height, pEntry->aTargetMap[0], pEntry->Screen.u16Flags));
+
         rc = vboxCmdVbvaCtlSubmitSync(&VBoxCommonFromDeviceExt(pDevExt)->guestCtx, &pResize->Hdr);
         if (RT_SUCCESS(rc))

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

@@ -365 +365 @@
 }
 
+void VBoxDumpSourceTargetArrays(VBOXWDDM_SOURCE *paSources, VBOXWDDM_TARGET *paTargets, uint32_t cScreens)
+{
+    RT_NOREF(paSources, paTargets, cScreens);
+
+    for (uint32_t i = 0; i < cScreens; i++)
+    {
+        LOG_EXACT(("source [%d] Sync 0x%x, cTgt %d, TgtMap0 0x%x, TgtRep %d, blanked %d\n",
+            i, paSources[i].u8SyncState, paSources[i].cTargets, paSources[i].aTargetMap[0], paSources[i].fTargetsReported, paSources[i].bBlankedByPowerOff));
+
+        LOG_EXACT(("target [%d] Sync 0x%x, VidPnSourceId %d, blanked %d\n",
+            i, paTargets[i].u8SyncState, paTargets[i].VidPnSourceId, paTargets[i].fBlankedByPowerOff));
+    }
+}
 
 static D3DKMDT_ENUMCOFUNCMODALITY_PIVOT_TYPE vboxVidPnCofuncModalityCurrentPathPivot(D3DKMDT_ENUMCOFUNCMODALITY_PIVOT_TYPE enmPivot,
@@ -1183 +1196 @@
         size.cy = pVidPnModeInfo->VideoSignalInfo.ActiveSize.cy;
         CrSaRemove(&DiffModes, CR_RSIZE2U64(size));
-        LOG(("mode (%d x %d) is already in monitor modeset\n", size.cx, size.cy));
+        LOGF(("mode (%d x %d) is already in monitor modeset\n", size.cx, size.cy));
     }
 
@@ -1195 +1208 @@
     }
 
-    LOG(("Adding %d additional modes to monitor modeset\n", CrSaGetSize(&DiffModes)));
+    LOGF(("Adding %d additional modes to monitor modeset\n", CrSaGetSize(&DiffModes)));
 
     Status = vboxVidPnMonitorModeSetFromArray(hVidPnModeSet, pVidPnModeSetInterface, &DiffModes);
@@ -2977 +2990 @@
 {
     RT_NOREF(pDevExt);
-    LOGREL_EXACT(("  >>>+++SourceMode Set for Source(%d)+++\n", VidPnSourceId));
+    LOGREL_EXACT(("\n  >>>+++SourceMode Set for Source(%d)+++\n", VidPnSourceId));
     D3DKMDT_HVIDPNSOURCEMODESET hCurVidPnSourceModeSet;
     const DXGK_VIDPNSOURCEMODESET_INTERFACE *pCurVidPnSourceModeSetInterface;
@@ -3019 +3032 @@
 {
     RT_NOREF(pDevExt);
-    LOGREL_EXACT(("  >>>---TargetMode Set for Target(%d)---\n", VidPnTargetId));
+    LOGREL_EXACT(("\n  >>>---TargetMode Set for Target(%d)---\n", VidPnTargetId));
     D3DKMDT_HVIDPNTARGETMODESET hCurVidPnTargetModeSet;
     const DXGK_VIDPNTARGETMODESET_INTERFACE *pCurVidPnTargetModeSetInterface;

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

@@ -48 +48 @@
 PVBOXWDDM_TARGET VBoxVidPnStTIterNext(VBOXWDDM_TARGET_ITER *pIter);
 
+void VBoxDumpSourceTargetArrays(VBOXWDDM_SOURCE *paSources, VBOXWDDM_TARGET *paTargets, uint32_t cScreens);
+
 /* !!!NOTE: The callback is responsible for releasing the path */
 typedef DECLCALLBACK(BOOLEAN) FNVBOXVIDPNENUMPATHS(D3DKMDT_HVIDPNTOPOLOGY hVidPnTopology, const DXGK_VIDPNTOPOLOGY_INTERFACE* pVidPnTopologyInterface,

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

@@ -5342 +5342 @@
     )
 {
-    LOGF(("ENTER, context(0x%x)", hAdapter));
+    LOG(("ENTER AffectedVidPnSourceId(%d) hAdapter(0x%x)", pCommitVidPnArg->AffectedVidPnSourceId, hAdapter));
 
     PVBOXMP_DEVEXT pDevExt = (PVBOXMP_DEVEXT)hAdapter;
@@ -5414 +5414 @@
         VBoxVidPnTargetsCopy(pDevExt->aTargets, paTargets, VBoxCommonFromDeviceExt(pDevExt)->cDisplays);
 
+        VBoxDumpSourceTargetArrays(paSources, paTargets, VBoxCommonFromDeviceExt(pDevExt)->cDisplays);
+
         vboxWddmGhDisplayCheckSetInfo(pDevExt);
     } while (0);
@@ -5420 +5422 @@
     RTMemFree(paTargets);
 
-    LOGF(("LEAVE, status(0x%x), context(0x%x)", Status, hAdapter));
+    LOG(("LEAVE, status(0x%x), hAdapter(0x%x)", Status, hAdapter));
 
     return Status;