Changeset 42098 in vbox for trunk

Timestamp:

Jul 10, 2012 4:16:18 PM (13 years ago)

Author:

vboxsync

Message:

wddm: new autoresize mechanism basics

Location:

trunk/src/VBox/Additions/WINNT

Files:

• Graphics/Video/mp/common/VBoxMPVidModes.cpp (modified) (2 diffs)
• Graphics/Video/mp/wddm/VBoxMPWddm.cpp (modified) (11 diffs)
• VBoxTray/VBoxDispIf.cpp (modified) (9 diffs)
• VBoxTray/VBoxDisplay.cpp (modified) (2 diffs)

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

@@ -493 +493 @@
     return (pExt->CurrentMode == 0);
 #else
-    return (!VBoxCommonFromDeviceExt(pExt)->cDisplays || !pExt->aSources[iDisplay].pPrimaryAllocation);
+    return (!VBoxCommonFromDeviceExt(pExt)->cDisplays
+# ifndef VBOX_WDDM_MINIPORT
+            || !pExt->aSources[iDisplay].pPrimaryAllocation
+# endif
+                    );
 #endif
 }
@@ -520 +524 @@
         bpp  = bpp  ? bpp :pExt->CurrentModeBPP;
 #else
-        xres = xres ? xres:pExt->aSources[iDisplay].pPrimaryAllocation->AllocData.SurfDesc.width;
-        yres = yres ? yres:pExt->aSources[iDisplay].pPrimaryAllocation->AllocData.SurfDesc.height;
-        bpp  = bpp  ? bpp :pExt->aSources[iDisplay].pPrimaryAllocation->AllocData.SurfDesc.bpp;
+        PVBOXWDDM_ALLOC_DATA pAllocData = pExt->aSources[iDisplay].pPrimaryAllocation ?
+                  &pExt->aSources[iDisplay].pPrimaryAllocation->AllocData
+                : &pExt->aSources[iDisplay].AllocData;
+        xres = xres ? xres:pAllocData->SurfDesc.width;
+        yres = yres ? yres:pAllocData->SurfDesc.height;
+        bpp  = bpp  ? bpp :pAllocData->SurfDesc.bpp;
 #endif
     }

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

@@ -510 +510 @@
 }
 
-typedef struct VBOXWDDMCHILDSTATUSCB
-{
-    PVBOXVDMACBUF_DR pDr;
-    PKEVENT pEvent;
-} VBOXWDDMCHILDSTATUSCB, *PVBOXWDDMCHILDSTATUSCB;
-
-static DECLCALLBACK(VOID) vboxWddmChildStatusReportCompletion(PVBOXMP_DEVEXT pDevExt, PVBOXVDMADDI_CMD pCmd, PVOID pvContext)
-{
-    /* we should be called from our DPC routine */
-    Assert(KeGetCurrentIrql() == DISPATCH_LEVEL);
-
-    PVBOXWDDMCHILDSTATUSCB pCtx = (PVBOXWDDMCHILDSTATUSCB)pvContext;
-    PVBOXVDMACBUF_DR pDr = pCtx->pDr;
-    PVBOXVDMACMD pHdr = VBOXVDMACBUF_DR_TAIL(pDr, VBOXVDMACMD);
-    VBOXVDMACMD_CHILD_STATUS_IRQ *pBody = VBOXVDMACMD_BODY(pHdr, VBOXVDMACMD_CHILD_STATUS_IRQ);
+static NTSTATUS vboxWddmChildStatusDoReportReconnected(PVBOXMP_DEVEXT pDevExt, VBOXVDMACMD_CHILD_STATUS_IRQ *pBody)
+{
+    NTSTATUS Status = STATUS_SUCCESS;
 
     for (UINT i = 0; i < pBody->cInfos; ++i)
@@ -533 +521 @@
             for (D3DDDI_VIDEO_PRESENT_TARGET_ID iChild = 0; iChild < (UINT)VBoxCommonFromDeviceExt(pDevExt)->cDisplays; ++iChild)
             {
-                NTSTATUS Status = vboxWddmChildStatusReportPerform(pDevExt, pInfo, iChild);
+                Status = vboxWddmChildStatusReportPerform(pDevExt, pInfo, iChild);
                 if (!NT_SUCCESS(Status))
                 {
@@ -543 +531 @@
         else
         {
-            NTSTATUS Status = vboxWddmChildStatusReportPerform(pDevExt, pInfo, D3DDDI_ID_UNINITIALIZED);
+            Status = vboxWddmChildStatusReportPerform(pDevExt, pInfo, D3DDDI_ID_UNINITIALIZED);
             if (!NT_SUCCESS(Status))
             {
@@ -552 +540 @@
     }
 
+    return Status;
+}
+
+typedef struct VBOXWDDMCHILDSTATUSCB
+{
+    PVBOXVDMACBUF_DR pDr;
+    PKEVENT pEvent;
+} VBOXWDDMCHILDSTATUSCB, *PVBOXWDDMCHILDSTATUSCB;
+
+static DECLCALLBACK(VOID) vboxWddmChildStatusReportCompletion(PVBOXMP_DEVEXT pDevExt, PVBOXVDMADDI_CMD pCmd, PVOID pvContext)
+{
+    /* we should be called from our DPC routine */
+    Assert(KeGetCurrentIrql() == DISPATCH_LEVEL);
+
+    PVBOXWDDMCHILDSTATUSCB pCtx = (PVBOXWDDMCHILDSTATUSCB)pvContext;
+    PVBOXVDMACBUF_DR pDr = pCtx->pDr;
+    PVBOXVDMACMD pHdr = VBOXVDMACBUF_DR_TAIL(pDr, VBOXVDMACMD);
+    VBOXVDMACMD_CHILD_STATUS_IRQ *pBody = VBOXVDMACMD_BODY(pHdr, VBOXVDMACMD_CHILD_STATUS_IRQ);
+
+    vboxWddmChildStatusDoReportReconnected(pDevExt, pBody);
+
     vboxVdmaCBufDrFree(&pDevExt->u.primary.Vdma, pDr);
 
@@ -562 +571 @@
 static NTSTATUS vboxWddmChildStatusReportReconnected(PVBOXMP_DEVEXT pDevExt, D3DDDI_VIDEO_PRESENT_TARGET_ID idTarget)
 {
+#ifdef VBOX_WDDM_MONITOR_REPLUG_IRQ
     NTSTATUS Status = STATUS_UNSUCCESSFUL;
     UINT cbCmd = VBOXVDMACMD_SIZE_FROMBODYSIZE(sizeof (VBOXVDMACMD_CHILD_STATUS_IRQ));
@@ -585 +595 @@
         pBody->aInfos[0].iChild = idTarget;
         pBody->aInfos[0].fFlags = VBOXVDMA_CHILD_STATUS_F_DISCONNECTED | VBOXVDMA_CHILD_STATUS_F_CONNECTED;
-
         /* we're going to KeWaitForSingleObject */
         Assert(KeGetCurrentIrql() < DISPATCH_LEVEL);
@@ -620 +629 @@
 
     return Status;
+#else
+    VBOXVDMACMD_CHILD_STATUS_IRQ Body = {0};
+    Body.cInfos = 1;
+    if (idTarget == D3DDDI_ID_ALL)
+    {
+        Body.fFlags |= VBOXVDMACMD_CHILD_STATUS_IRQ_F_APPLY_TO_ALL;
+    }
+    Body.aInfos[0].iChild = idTarget;
+    Body.aInfos[0].fFlags = VBOXVDMA_CHILD_STATUS_F_DISCONNECTED | VBOXVDMA_CHILD_STATUS_F_CONNECTED;
+    Assert(KeGetCurrentIrql() <= DISPATCH_LEVEL);
+    return vboxWddmChildStatusDoReportReconnected(pDevExt, &Body);
+#endif
 }
 
@@ -629 +650 @@
 
     Assert(!bChanged[0]);
-    for (i = 1; i < VBoxCommonFromDeviceExt(pDevExt)->cDisplays; ++i)
+    for (i = 0; i < VBoxCommonFromDeviceExt(pDevExt)->cDisplays; ++i)
     {
         /* @todo: check that we actually need the current source->target */
@@ -4083 +4104 @@
             case VBOXESC_REINITVIDEOMODES:
             {
-                /* clear driver's internal videomodes cache */
-                VBoxWddmInvalidateVideoModesInfo(pDevExt);
-                Status = STATUS_SUCCESS;
+                PVBOXWDDM_VIDEOMODES_INFO pInfo = VBoxWddmUpdateVideoModesInfo(pDevExt, NULL);
+                Status = vboxWddmChildStatusCheck(pDevExt, pInfo);
+                if (!NT_SUCCESS(Status))
+                {
+                    WARN(("vboxWddmChildStatusCheck failed, Status 0x%x", Status));
+                }
                 break;
             }
@@ -6175 +6199 @@
     LOGF(("ENTER, hAdapter(0x%x)", hAdapter));
     vboxVDbgBreakF();
-    AssertBreakpoint();
 
     PVBOXMP_DEVEXT pDevExt = (PVBOXMP_DEVEXT)hAdapter;
@@ -6577 +6600 @@
         }
 
-//#ifdef VBOX_WDDM_WIN8
-//        LOGREL(("Current win8 video driver only supports display-only mode no matter whether or not host 3D is enabled!"));
-//        g_VBoxDisplayOnly = 1;
-//#endif
+#ifdef DEBUG_misha
+        /* 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!"));
+        g_VBoxDisplayOnly = 1;
+#endif
 
         if (NT_SUCCESS(Status))

trunk/src/VBox/Additions/WINNT/VBoxTray/VBoxDispIf.cpp

@@ -211 +211 @@
     PVBOXDISPIFESCAPE pEscape;
     int cbData;
+    D3DDDI_ESCAPEFLAGS EscapeFlags;
 } VBOXDISPIFWDDM_ESCAPEOP_CONTEXT, *PVBOXDISPIFWDDM_ESCAPEOP_CONTEXT;
 
@@ -221 +222 @@
     //EscapeData.hDevice = NULL;
     EscapeData.Type = D3DKMT_ESCAPE_DRIVERPRIVATE;
-    EscapeData.Flags.HardwareAccess = 1;
+    EscapeData.Flags = pCtx->EscapeFlags;
     EscapeData.pPrivateDriverData = pCtx->pEscape;
     EscapeData.PrivateDriverDataSize = VBOXDISPIFESCAPE_SIZE(pCtx->cbData);
@@ -231 +232 @@
 }
 
-static DWORD vboxDispIfEscapeWDDM(PCVBOXDISPIF pIf, PVBOXDISPIFESCAPE pEscape, int cbData)
+static DWORD vboxDispIfEscapeWDDM(PCVBOXDISPIF pIf, PVBOXDISPIFESCAPE pEscape, int cbData, BOOL fHwAccess)
 {
     VBOXDISPIFWDDM_ESCAPEOP_CONTEXT Ctx = {0};
     Ctx.pEscape = pEscape;
     Ctx.cbData = cbData;
+    if (fHwAccess)
+        Ctx.EscapeFlags.HardwareAccess = 1;
     DWORD err = vboxDispIfWDDMAdapterOp(pIf, -1 /* iDisplay, -1 means primary */, vboxDispIfEscapeWDDMOp, &Ctx);
     if (err == NO_ERROR)
@@ -332 +335 @@
 #ifdef VBOX_WITH_WDDM
         case VBOXDISPIF_MODE_WDDM:
-            return vboxDispIfEscapeWDDM(pIf, pEscape, cbData);
+            return vboxDispIfEscapeWDDM(pIf, pEscape, cbData, TRUE /* BOOL fHwAccess */);
 #endif
         default:
@@ -461 +464 @@
 
 #ifdef VBOX_WITH_WDDM
+static DWORD vboxDispIfReinitVideoModes(PCVBOXDISPIF const pIf)
+{
+    VBOXDISPIFESCAPE escape = {0};
+    escape.escapeCode = VBOXESC_REINITVIDEOMODES;
+    DWORD err = vboxDispIfEscapeWDDM(pIf, &escape, 0, FALSE /* hw access must be false here,
+                                                             * otherwise the miniport driver would fail
+                                                             * request to prevent a deadlock */);
+    if (err != NO_ERROR)
+    {
+        Log((__FUNCTION__": VBoxDispIfEscape failed with err (%d)\n", err));
+    }
+    return err;
+}
+
 DWORD vboxDispIfResizeModesWDDM(PCVBOXDISPIF const pIf, DISPLAY_DEVICE *paDisplayDevices, DEVMODE *paDeviceModes, UINT cDevModes)
 {
@@ -510 +527 @@
     }
 
+    BOOL fAbleToInvalidateVidPn = FALSE;
+
     if (winEr == NO_ERROR)
     {
@@ -527 +546 @@
             winEr = ERROR_GEN_FAILURE;
         }
+        else
+        {
+            fAbleToInvalidateVidPn = TRUE;
+        }
     }
 
@@ -535 +558 @@
         Status = pIf->modeData.wddm.pfnD3DKMTCloseAdapter(&ClosaAdapterData);
         Assert(!Status);
+    }
+
+    if (!fAbleToInvalidateVidPn)
+    {
+        /* fallback impl: make the driver invalidate VidPn,
+         * which is done by emulating a monitor re-plug currently */
+        vboxDispIfReinitVideoModes(pIf);
+
+        /* sleep 2 seconds: dirty hack to wait for the new monitor info to be picked up,
+         * @todo: implement it properly by monitoring monitor device arrival/removal */
+        Sleep(2 * 1000);
     }
 
@@ -556 +590 @@
                   paDeviceModes[i].dmPosition.x,
                   paDeviceModes[i].dmPosition.y));
+
+            if (!fAbleToInvalidateVidPn)
+            {
+                /* @todo: the miniport might have been adjusted the display mode stuff,
+                 * adjust the paDeviceModes[i] by picking the closest available one */
+            }
 
             LONG status = pIf->modeData.wddm.pfnChangeDisplaySettingsEx((LPSTR)paDisplayDevices[i].DeviceName,

trunk/src/VBox/Additions/WINNT/VBoxTray/VBoxDisplay.cpp

@@ -41 +41 @@
 
 #ifdef VBOX_WITH_WDDM
-static bool vboxWddmReinitVideoModes(VBOXDISPLAYCONTEXT *pCtx)
-{
-    VBOXDISPIFESCAPE escape = {0};
-    escape.escapeCode = VBOXESC_REINITVIDEOMODES;
-    DWORD err = VBoxDispIfEscape(&pCtx->pEnv->dispIf, &escape, 0);
-    if (err != NO_ERROR)
-    {
-        Log((__FUNCTION__": VBoxDispIfEscape failed with err (%d)\n", err));
-        return false;
-    }
-    return true;
-}
-
 typedef enum
 {
@@ -173 +160 @@
 #else
                     enmType = VBOXDISPLAY_DRIVER_TYPE_XPDM;
-                else if (strcmp(&dispDevice.DeviceString[0], "VirtualBox Graphics Adapter (Microsoft Corporation - WDDM)") == 0)
+                /* WDDM driver can now have multiple incarnations,
+                 * if the driver name contains VirtualBox, and does NOT match the XPDM name,
+                 * assume it to be WDDM */
+                else if (strstr(&dispDevice.DeviceString[0], "VirtualBox"))
                     enmType = VBOXDISPLAY_DRIVER_TYPE_WDDM;
 #endif