Changeset 42128 in vbox for trunk/src/VBox/Additions/WINNT/Graphics/Video

Timestamp:

Jul 12, 2012 4:31:42 PM (12 years ago)

Author:

vboxsync

Message:

wddm/d-o: multiscreen working

Location:

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

Files:

• common/VBoxMPVidModes.cpp (modified) (1 diff)
• wddm/VBoxMPMisc.cpp (modified) (1 diff)
• wddm/VBoxMPMisc.h (modified) (1 diff)
• wddm/VBoxMPVidPn.cpp (modified) (1 diff)
• wddm/VBoxMPWddm.cpp (modified) (4 diffs)

trunk/src/VBox/Additions/WINNT/Graphics/Video/mp/common/VBoxMPVidModes.cpp

@@ -492 +492 @@
 #ifdef VBOX_XPDM_MINIPORT
     return (pExt->CurrentMode == 0);
-#else
+#elif defined(VBOX_WDDM_WIN8)
+    return FALSE;
+#else /* VBOX_WDDM_MINIPORT && !VBOX_WDDM_MINIPORT */
     return (!VBoxCommonFromDeviceExt(pExt)->cDisplays
-# ifndef VBOX_WDDM_MINIPORT
-            || !pExt->aSources[iDisplay].pPrimaryAllocation
-# endif
-                    );
+            || !pExt->aSources[iDisplay].pPrimaryAllocation);
 #endif
 }

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

@@ -2627 +2627 @@
     return STATUS_SUCCESS;
 }
+
+#ifdef VBOX_WDDM_WIN8
+void vboxWddmDiInitDefault(DXGK_DISPLAY_INFORMATION *pInfo, PHYSICAL_ADDRESS PhAddr, D3DDDI_VIDEO_PRESENT_SOURCE_ID VidPnSourceId)
+{
+    pInfo->Width = 1024;
+    pInfo->Height = 768;
+    pInfo->Pitch = pInfo->Width * 4;
+    pInfo->ColorFormat = D3DDDIFMT_A8R8G8B8;
+    pInfo->PhysicAddress = PhAddr;
+    pInfo->TargetId = VidPnSourceId;
+    pInfo->AcpiId = 0;
+}
+
+void vboxWddmDiToAllocData(PVBOXMP_DEVEXT pDevExt, const DXGK_DISPLAY_INFORMATION *pInfo, PVBOXWDDM_ALLOC_DATA pAllocData)
+{
+    pAllocData->SurfDesc.width = pInfo->Width;
+    pAllocData->SurfDesc.height = pInfo->Height;
+    pAllocData->SurfDesc.format = pInfo->ColorFormat;
+    pAllocData->SurfDesc.bpp = vboxWddmCalcBitsPerPixel(pInfo->ColorFormat);
+    pAllocData->SurfDesc.pitch = pInfo->Pitch;
+    pAllocData->SurfDesc.depth = 1;
+    pAllocData->SurfDesc.slicePitch = pInfo->Pitch;
+    pAllocData->SurfDesc.cbSize = pInfo->Pitch * pInfo->Height;
+    pAllocData->SurfDesc.VidPnSourceId = pInfo->TargetId;
+    pAllocData->SurfDesc.RefreshRate.Numerator = 60000;
+    pAllocData->SurfDesc.RefreshRate.Denominator = 1000;
+
+    /* the address here is not a VRAM offset! so convert it to offset */
+    vboxWddmAddrSetVram(&pAllocData->Addr, 1,
+            vboxWddmVramAddrToOffset(pDevExt, pInfo->PhysicAddress));
+}
+
+void vboxWddmDmAdjustDefaultVramLocations(PVBOXMP_DEVEXT pDevExt, D3DDDI_VIDEO_PRESENT_SOURCE_ID ModifiedVidPnSourceId)
+{
+    PVBOXWDDM_SOURCE pSource = &pDevExt->aSources[ModifiedVidPnSourceId];
+    PHYSICAL_ADDRESS PhAddr;
+    AssertRelease(pSource->AllocData.Addr.SegmentId);
+    AssertRelease(pSource->AllocData.Addr.offVram != VBOXVIDEOOFFSET_VOID);
+    PhAddr.QuadPart = pSource->AllocData.Addr.offVram;
+
+    for (UINT i = ModifiedVidPnSourceId + 1; i < (UINT)VBoxCommonFromDeviceExt(pDevExt)->cDisplays; ++i)
+    {
+        /* increaze the phaddr based on the previous source size info */
+        PhAddr.QuadPart += pSource->AllocData.SurfDesc.cbSize;
+        PhAddr.QuadPart = ROUND_TO_PAGES(PhAddr.QuadPart);
+        pSource = &pDevExt->aSources[i];
+        pSource->AllocData.Addr.SegmentId = 1;
+        pSource->AllocData.Addr.offVram = PhAddr.QuadPart;
+    }
+}
+#endif

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

@@ -210 +210 @@
 NTSTATUS VBoxWddmSlTerm(PVBOXMP_DEVEXT pDevExt);
 
+#ifdef VBOX_WDDM_WIN8
+void vboxWddmDiInitDefault(DXGK_DISPLAY_INFORMATION *pInfo, PHYSICAL_ADDRESS PhAddr, D3DDDI_VIDEO_PRESENT_SOURCE_ID VidPnSourceId);
+void vboxWddmDiToAllocData(PVBOXMP_DEVEXT pDevExt, const DXGK_DISPLAY_INFORMATION *pInfo, struct VBOXWDDM_ALLOC_DATA *pAllocData);
+void vboxWddmDmAdjustDefaultVramLocations(PVBOXMP_DEVEXT pDevExt, D3DDDI_VIDEO_PRESENT_SOURCE_ID ModifiedVidPnSourceId);
+#endif
+
 #endif /* #ifndef ___VBoxMPMisc_h__ */

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

@@ -2072 +2072 @@
         pSource->AllocData.SurfDesc.slicePitch = pVidPnSourceModeInfo->Format.Graphics.Stride;
         pSource->AllocData.SurfDesc.cbSize = pVidPnSourceModeInfo->Format.Graphics.Stride * pVidPnSourceModeInfo->Format.Graphics.PrimSurfSize.cy;
+#ifdef VBOX_WDDM_WIN8
+        if (g_VBoxDisplayOnly)
+        {
+            vboxWddmDmAdjustDefaultVramLocations(pDevExt, srcId);
+        }
+#endif
+    }
+    else
+    {
+        Assert(!pAllocation);
     }
     Assert(pSource->AllocData.SurfDesc.VidPnSourceId == srcId);

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

@@ -179 +179 @@
 NTSTATUS vboxWddmGhDisplayHideScreen(PVBOXMP_DEVEXT pDevExt, D3DDDI_VIDEO_PRESENT_TARGET_ID VidPnTargetId)
 {
+    Assert(0);
     VBOXWDDM_SURFACE_DESC SurfDesc = {0};
     POINT VScreenPos = {0};
@@ -1128 +1129 @@
                     {
                         PVBOXWDDM_SOURCE pSource = &pDevExt->aSources[0];
-                        pSource->AllocData.SurfDesc.width = DisplayInfo.Width;
-                        pSource->AllocData.SurfDesc.height = DisplayInfo.Height;
-                        pSource->AllocData.SurfDesc.format = DisplayInfo.ColorFormat;
-                        pSource->AllocData.SurfDesc.bpp = vboxWddmCalcBitsPerPixel(DisplayInfo.ColorFormat);
-                        pSource->AllocData.SurfDesc.pitch = DisplayInfo.Pitch;
-                        pSource->AllocData.SurfDesc.depth = 1;
-                        pSource->AllocData.SurfDesc.slicePitch = DisplayInfo.Pitch;
-                        pSource->AllocData.SurfDesc.cbSize = DisplayInfo.Pitch * DisplayInfo.Height;
-                        pSource->AllocData.SurfDesc.VidPnSourceId = 0;
-                        pSource->AllocData.SurfDesc.RefreshRate.Numerator = 60000;
-                        pSource->AllocData.SurfDesc.RefreshRate.Denominator = 1000;
-
-                        /* the address here is not a VRAM offset! so convert it to offset */
-                        vboxWddmAddrSetVram(&pSource->AllocData.Addr, 1,
-                                vboxWddmVramAddrToOffset(pDevExt, DisplayInfo.PhysicAddress));
+                        PHYSICAL_ADDRESS PhAddr;
+                        /* display info may sometimes not be valid, e.g. on from-full-graphics wddm driver update
+                         * ensure we have something meaningful here */
+                        if (!DisplayInfo.Width)
+                        {
+                            PhAddr = VBoxCommonFromDeviceExt(pDevExt)->phVRAM;
+                            vboxWddmDiInitDefault(&DisplayInfo, PhAddr, 0);
+                        }
+                        else
+                        {
+                            PhAddr = DisplayInfo.PhysicAddress;
+                            DisplayInfo.TargetId = 0;
+                        }
+
+                        vboxWddmDiToAllocData(pDevExt, &DisplayInfo, &pSource->AllocData);
+
+                        /* init the rest source infos with some default values */
+                        for (UINT i = 1; i < (UINT)VBoxCommonFromDeviceExt(pDevExt)->cDisplays; ++i)
+                        {
+                            PhAddr.QuadPart += pSource->AllocData.SurfDesc.cbSize;
+                            PhAddr.QuadPart = ROUND_TO_PAGES(PhAddr.QuadPart);
+                            vboxWddmDiInitDefault(&DisplayInfo, PhAddr, i);
+                            pSource = &pDevExt->aSources[i];
+                            vboxWddmDiToAllocData(pDevExt, &DisplayInfo, &pSource->AllocData);
+                        }
                     }
                     else
@@ -6604 +6615 @@
         }
 
-#if 0 //defined(DEBUG_misha) && defined(VBOX_WDDM_WIN8)
+#if defined(DEBUG_misha) && defined(VBOX_WDDM_WIN8)
         /* force g_VBoxDisplayOnly for debugging purposes */
         LOGREL(("Current win8 video driver only supports display-only mode no matter whether or not host 3D is enabled!"));
@@ -6660 +6671 @@
     return Status;
 }
+