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

Timestamp:

Jan 29, 2016 9:07:19 AM (9 years ago)

Author:

vboxsync

Message:

WDDM: bugref:8228: display-only driver does not need vsync.

Location:

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

Files:

• VBoxMPVidPn.cpp (modified) (1 diff)
• VBoxMPWddm.cpp (modified) (2 diffs)

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

@@ -128 +128 @@
     pVsi->ActiveSize.cx = pResolution->cx;
     pVsi->ActiveSize.cy = pResolution->cy;
-    pVsi->VSyncFreq.Numerator = VSync * 1000;
-    pVsi->VSyncFreq.Denominator = 1000;
-    pVsi->TotalSize.cx = pVsi->ActiveSize.cx;// + VBOXVDPN_C_DISPLAY_HBLANK_SIZE;
-    pVsi->TotalSize.cy = pVsi->ActiveSize.cy;// + VBOXVDPN_C_DISPLAY_VBLANK_SIZE;
-    pVsi->PixelRate = pVsi->TotalSize.cx * pVsi->TotalSize.cy * VSync;
-    pVsi->HSyncFreq.Numerator = (UINT)((pVsi->PixelRate / pVsi->TotalSize.cy) * 1000);
-    pVsi->HSyncFreq.Denominator = 1000;
+    pVsi->TotalSize = pVsi->ActiveSize;
+    if (VBOXWDDM_IS_DISPLAYONLY())
+    {
+        /* VSYNC is not implemented in display-only mode (#8228).
+         * In this case Windows checks that frequencies are not specified.
+         */
+        pVsi->VSyncFreq.Numerator = D3DKMDT_FREQUENCY_NOTSPECIFIED;
+        pVsi->VSyncFreq.Denominator = D3DKMDT_FREQUENCY_NOTSPECIFIED;
+        pVsi->PixelRate = D3DKMDT_FREQUENCY_NOTSPECIFIED;
+        pVsi->HSyncFreq.Numerator = D3DKMDT_FREQUENCY_NOTSPECIFIED;
+        pVsi->HSyncFreq.Denominator = D3DKMDT_FREQUENCY_NOTSPECIFIED;
+    }
+    else
+    {
+        pVsi->VSyncFreq.Numerator = VSync * 1000;
+        pVsi->VSyncFreq.Denominator = 1000;
+        pVsi->PixelRate = pVsi->TotalSize.cx * pVsi->TotalSize.cy * VSync;
+        pVsi->HSyncFreq.Numerator = (UINT)((pVsi->PixelRate / pVsi->TotalSize.cy) * 1000);
+        pVsi->HSyncFreq.Denominator = 1000;
+    }
     pVsi->ScanLineOrdering = D3DDDI_VSSLO_PROGRESSIVE;
 

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

@@ -7301 +7301 @@
     DriverInitializationData.DxgkDdiUpdateActiveVidPnPresentPath = DxgkDdiUpdateActiveVidPnPresentPath;
     DriverInitializationData.DxgkDdiRecommendMonitorModes = DxgkDdiRecommendMonitorModes;
-    DriverInitializationData.DxgkDdiGetScanLine = DxgkDdiGetScanLine;
     DriverInitializationData.DxgkDdiQueryVidPnHWCapability = DxgkDdiQueryVidPnHWCapability;
     DriverInitializationData.DxgkDdiPresentDisplayOnly = DxgkDdiPresentDisplayOnly;
@@ -7308 +7307 @@
     DriverInitializationData.DxgkDdiSystemDisplayWrite = DxgkDdiSystemDisplayWrite;
 //    DriverInitializationData.DxgkDdiGetChildContainerId = DxgkDdiGetChildContainerId;
-    DriverInitializationData.DxgkDdiControlInterrupt = DxgkDdiControlInterrupt;
 //    DriverInitializationData.DxgkDdiSetPowerComponentFState = DxgkDdiSetPowerComponentFState;
 //    DriverInitializationData.DxgkDdiPowerRuntimeControlRequest = DxgkDdiPowerRuntimeControlRequest;
 //    DriverInitializationData.DxgkDdiNotifySurpriseRemoval = DxgkDdiNotifySurpriseRemoval;
+
+    /* Display-only driver is not required to report VSYNC.
+     * The Microsoft KMDOD driver sample does not implement DxgkDdiControlInterrupt and DxgkDdiGetScanLine.
+     * The functions must be either both implemented or none implemented.
+     * Windows 10 10586 guests had problems with VSYNC in display-only driver (#8228).
+     * Therefore the driver does not implement DxgkDdiControlInterrupt and DxgkDdiGetScanLine.
+     */
 
     NTSTATUS Status = DxgkInitializeDisplayOnlyDriver(pDriverObject,