Changeset 81686 in vbox for trunk/src/VBox/Additions/WINNT/Graphics

Timestamp:

Nov 5, 2019 8:06:17 PM (5 years ago)

Author:

vboxsync

Message:

WDDM: process HGSMI interrupts for VBoxSVGA adapter, this makes VHWA functional again; updated a todo

Location:

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

Files:

• VBoxMPLegacy.cpp (modified) (1 diff)
• VBoxMPWddm.cpp (modified) (6 diffs)
• gallium/VBoxMPGaWddm.cpp (modified) (1 diff)

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

@@ -1716 +1716 @@
     AssertNtStatusSuccess(Status); NOREF(Status);
 
-//    if (context.data.bNotifyDpc)
-    pDevExt->u.primary.DxgkInterface.DxgkCbNotifyDpc(pDevExt->u.primary.DxgkInterface.DeviceHandle);
-
     if (!vboxVtListIsEmpty(&context.data.CtlList))
     {

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

@@ -1033 +1033 @@
                         //  Must be removed eventually.
                         pDevExt->fCmdVbvaEnabled = TRUE;
-                        pDevExt->fComplexTopologiesEnabled = FALSE; /** @todo Enable after implementing multimonitor support. */
+                        pDevExt->fComplexTopologiesEnabled = TRUE; /** @todo Implement clones support. */
                     }
                 }
@@ -4611 +4611 @@
 }
 
-static NTSTATUS vboxWddmInitDisplayOnlyDriver(IN PDRIVER_OBJECT pDriverObject, IN PUNICODE_STRING pRegistryPath, VBOXVIDEO_HWTYPE enmHwType)
+static BOOLEAN DxgkDdiInterruptRoutine(const PVOID MiniportDeviceContext,
+                                       ULONG MessageNumber)
+{
+    BOOLEAN const fVMSVGA = GaDxgkDdiInterruptRoutine(MiniportDeviceContext, MessageNumber);
+    BOOLEAN const fHGSMI = DxgkDdiInterruptRoutineLegacy(MiniportDeviceContext, MessageNumber);
+    return fVMSVGA || fHGSMI;
+}
+
+static VOID DxgkDdiDpcRoutine(const PVOID MiniportDeviceContext)
+{
+    PVBOXMP_DEVEXT pDevExt = (PVBOXMP_DEVEXT)MiniportDeviceContext;
+
+    GaDxgkDdiDpcRoutine(MiniportDeviceContext);
+    DxgkDdiDpcRoutineLegacy(MiniportDeviceContext);
+
+    pDevExt->u.primary.DxgkInterface.DxgkCbNotifyDpc(pDevExt->u.primary.DxgkInterface.DeviceHandle);
+}
+
+static NTSTATUS vboxWddmInitDisplayOnlyDriver(IN PDRIVER_OBJECT pDriverObject, IN PUNICODE_STRING pRegistryPath)
 {
     KMDDOD_INITIALIZATION_DATA DriverInitializationData = {'\0'};
@@ -4622 +4640 @@
     DriverInitializationData.DxgkDdiRemoveDevice = DxgkDdiRemoveDevice;
     DriverInitializationData.DxgkDdiDispatchIoRequest = DxgkDdiDispatchIoRequest;
-#ifdef VBOX_WITH_MESA3D
-    if (enmHwType == VBOXVIDEO_HWTYPE_VMSVGA)
-    {
-        DriverInitializationData.DxgkDdiInterruptRoutine = GaDxgkDdiInterruptRoutine;
-        DriverInitializationData.DxgkDdiDpcRoutine = GaDxgkDdiDpcRoutine;
-    }
-    else
-#endif
-    {
-        DriverInitializationData.DxgkDdiInterruptRoutine = DxgkDdiInterruptRoutineLegacy;
-        DriverInitializationData.DxgkDdiDpcRoutine = DxgkDdiDpcRoutineLegacy;
-    }
+    DriverInitializationData.DxgkDdiInterruptRoutine = DxgkDdiInterruptRoutine;
+    DriverInitializationData.DxgkDdiDpcRoutine = DxgkDdiDpcRoutine;
     DriverInitializationData.DxgkDdiQueryChildRelations = DxgkDdiQueryChildRelations;
     DriverInitializationData.DxgkDdiQueryChildStatus = DxgkDdiQueryChildStatus;
@@ -4698 +4706 @@
     DriverInitializationData.DxgkDdiRemoveDevice = DxgkDdiRemoveDevice;
     DriverInitializationData.DxgkDdiDispatchIoRequest = DxgkDdiDispatchIoRequest;
+    DriverInitializationData.DxgkDdiInterruptRoutine  = DxgkDdiInterruptRoutine;
+    DriverInitializationData.DxgkDdiDpcRoutine        = DxgkDdiDpcRoutine;
 
 #ifdef VBOX_WITH_MESA3D
     if (enmHwType == VBOXVIDEO_HWTYPE_VMSVGA)
     {
-        DriverInitializationData.DxgkDdiInterruptRoutine  = GaDxgkDdiInterruptRoutine;
-        DriverInitializationData.DxgkDdiDpcRoutine        = GaDxgkDdiDpcRoutine;
         DriverInitializationData.DxgkDdiPatch             = GaDxgkDdiPatch;
         DriverInitializationData.DxgkDdiSubmitCommand     = GaDxgkDdiSubmitCommand;
@@ -4715 +4723 @@
 #endif
     {
-        DriverInitializationData.DxgkDdiInterruptRoutine  = DxgkDdiInterruptRoutineLegacy;
-        DriverInitializationData.DxgkDdiDpcRoutine        = DxgkDdiDpcRoutineLegacy;
         DriverInitializationData.DxgkDdiPatch             = DxgkDdiPatchLegacy;
         DriverInitializationData.DxgkDdiSubmitCommand     = DxgkDdiSubmitCommandLegacy;
@@ -4948 +4954 @@
             if (g_VBoxDisplayOnly)
             {
-                Status = vboxWddmInitDisplayOnlyDriver(DriverObject, RegistryPath, enmHwType);
+                Status = vboxWddmInitDisplayOnlyDriver(DriverObject, RegistryPath);
             }
             else

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

@@ -1468 +1468 @@
     }
 
-    pDevExt->u.primary.DxgkInterface.DxgkCbNotifyDpc(pDevExt->u.primary.DxgkInterface.DeviceHandle);
-
     /* Scan fence objects and mark all with u32FenceId < u32LastCompletedFenceId as SIGNALED */
     const uint32_t u32LastCompletedFenceId = ASMAtomicReadU32(&pGaDevExt->u32LastCompletedFenceId);