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

Timestamp:

Aug 28, 2019 1:32:17 PM (5 years ago)

Author:

vboxsync

Message:

WDDM: remove unused VBOX_VDMA_WITH_WATCHDOG code. bugref:9529

Location:

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

Files:

• Makefile.kmk (modified) (1 diff)
• common/VBoxMPDevExt.h (modified) (1 diff)
• wddm/VBoxMPMisc.cpp (modified) (1 diff)
• wddm/VBoxMPMisc.h (modified) (1 diff)
• wddm/VBoxMPWddm.cpp (modified) (4 diffs)

trunk/src/VBox/Additions/WINNT/Graphics/Video/mp/Makefile.kmk

@@ -94 +94 @@
  VBoxWddm_DEFS            += LOG_TO_BACKDOOR
  VBoxWddm_DEFS            += VBOX_SVN_REV=$(VBOX_SVN_REV)
- ifdef VBOX_VDMA_WITH_WATCHDOG
-  VBoxWddm_DEFS           += VBOX_VDMA_WITH_WATCHDOG
- endif
  VBoxWddm_INCS            += \
         ../../../include \

trunk/src/VBox/Additions/WINNT/Graphics/Video/mp/common/VBoxMPDevExt.h

@@ -166 +166 @@
 
 
-#ifdef VBOX_VDMA_WITH_WATCHDOG
-   PKTHREAD pWdThread;
-   KEVENT WdEvent;
-#endif
    BOOL bVSyncTimerEnabled;
    volatile uint32_t fVSyncInVBlank;

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

@@ -1289 +1289 @@
 }
 
-#ifdef VBOX_VDMA_WITH_WATCHDOG
-static int vboxWddmWdProgram(PVBOXMP_DEVEXT pDevExt, uint32_t cMillis)
-{
-    int rc = VINF_SUCCESS;
-    VBOXVDMA_CTL RT_UNTRUSTED_VOLATILE_GUEST *pCmd
-        = (VBOXVDMA_CTL RT_UNTRUSTED_VOLATILE_GUEST *)VBoxSHGSMICommandAlloc(&VBoxCommonFromDeviceExt(pDevExt)->guestCtx.heapCtx,
-                                                                             sizeof(VBOXVDMA_CTL), HGSMI_CH_VBVA, VBVA_VDMA_CTL);
-    if (pCmd)
-    {
-        pCmd->enmCtl = VBOXVDMA_CTL_TYPE_WATCHDOG;
-        pCmd->u32Offset = cMillis;
-        pCmd->i32Result = VERR_NOT_SUPPORTED;
-
-        const VBOXSHGSMIHEADER* pHdr = VBoxSHGSMICommandPrepSynch(&VBoxCommonFromDeviceExt(pDevExt)->guestCtx.heapCtx, pCmd);
-        Assert(pHdr);
-        if (pHdr)
-        {
-            do
-            {
-                HGSMIOFFSET offCmd = VBoxSHGSMICommandOffset(&VBoxCommonFromDeviceExt(pDevExt)->guestCtx.heapCtx, pHdr);
-                Assert(offCmd != HGSMIOFFSET_VOID);
-                if (offCmd != HGSMIOFFSET_VOID)
-                {
-                    VBVO_PORT_WRITE_U32(VBoxCommonFromDeviceExt(pDevExt)->guestCtx.port, offCmd);
-                    /* Make the compiler aware that the host has changed memory. */
-                    ASMCompilerBarrier();
-                    rc = VBoxSHGSMICommandDoneSynch(&VBoxCommonFromDeviceExt(pDevExt)->guestCtx.heapCtx, pHdr);
-                    AssertRC(rc);
-                    if (RT_SUCCESS(rc))
-                    {
-                        rc = pCmd->i32Result;
-                        AssertRC(rc);
-                    }
-                    break;
-                }
-                else
-                    rc = VERR_INVALID_PARAMETER;
-                /* fail to submit, cancel it */
-                VBoxSHGSMICommandCancelSynch(&VBoxCommonFromDeviceExt(pDevExt)->guestCtx.heapCtx, pHdr);
-            } while (0);
-        }
-
-        VBoxSHGSMICommandFree(&VBoxCommonFromDeviceExt(pDevExt)->guestCtx.heapCtx, pCmd);
-    }
-    else
-    {
-        LOGREL(("HGSMIHeapAlloc failed"));
-        rc = VERR_OUT_OF_RESOURCES;
-    }
-    return rc;
-}
-
-static uint32_t g_VBoxWdTimeout = 4000;
-/* if null g_VBoxWdTimeout / 2 is used */
-static uint32_t g_VBoxWdTimerPeriod = 0;
-
-static VOID vboxWddmWdThread(PVOID pvUser)
-{
-    PVBOXMP_DEVEXT pDevExt = (PVBOXMP_DEVEXT)pvUser;
-    BOOLEAN bExit = FALSE;
-    int rc;
-    while (1)
-    {
-        if (!bExit)
-        {
-            rc = vboxWddmWdProgram(pDevExt, g_VBoxWdTimeout /* ms */);
-            AssertRC(rc);
-        }
-        else
-        {
-            rc = vboxWddmWdProgram(pDevExt, 0 /* to disable WatchDog */);
-            AssertRC(rc);
-            break;
-        }
-        LARGE_INTEGER Timeout;
-        uint32_t timerTimeOut = g_VBoxWdTimerPeriod ? g_VBoxWdTimerPeriod : g_VBoxWdTimeout / 2;
-        Timeout.QuadPart = 10000ULL * timerTimeOut /* ms */;
-        NTSTATUS Status = KeWaitForSingleObject(&pDevExt->WdEvent, Executive, KernelMode, FALSE, &Timeout);
-        if (Status != STATUS_TIMEOUT)
-            bExit = TRUE;
-    }
-}
-
-NTSTATUS vboxWddmWdInit(PVBOXMP_DEVEXT pDevExt)
-{
-    KeInitializeEvent(&pDevExt->WdEvent, NotificationEvent, FALSE);
-
-    NTSTATUS Status = vboxWddmThreadCreate(&pDevExt->pWdThread, vboxWddmWdThread, pDevExt);
-    if (!NT_SUCCESS(Status))
-    {
-        WARN(("vboxWddmThreadCreate failed, Status 0x%x", Status));
-        pDevExt->pWdThread = NULL;
-    }
-    return Status;
-}
-
-NTSTATUS vboxWddmWdTerm(PVBOXMP_DEVEXT pDevExt)
-{
-    if (!pDevExt->pWdThread)
-        return STATUS_SUCCESS;
-
-    KeSetEvent(&pDevExt->WdEvent, 0, FALSE);
-
-    KeWaitForSingleObject(pDevExt->pWdThread, Executive, KernelMode, FALSE, NULL);
-    ObDereferenceObject(pDevExt->pWdThread);
-    pDevExt->pWdThread = NULL;
-    return STATUS_SUCCESS;
-}
-#endif
-
 static int vboxWddmSlConfigure(PVBOXMP_DEVEXT pDevExt, uint32_t fFlags)
 {

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

@@ -154 +154 @@
 NTSTATUS vboxWddmDrvCfgInit(PUNICODE_STRING pRegStr);
 
-#ifdef VBOX_VDMA_WITH_WATCHDOG
-NTSTATUS vboxWddmWdInit(PVBOXMP_DEVEXT pDevExt);
-NTSTATUS vboxWddmWdTerm(PVBOXMP_DEVEXT pDevExt);
-#endif
-
 NTSTATUS VBoxWddmSlEnableVSyncNotification(PVBOXMP_DEVEXT pDevExt, BOOLEAN fEnable);
 NTSTATUS VBoxWddmSlGetScanLine(PVBOXMP_DEVEXT pDevExt, DXGKARG_GETSCANLINE *pSl);

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

@@ -820 +820 @@
         if (RT_SUCCESS(rc))
         {
-#ifdef VBOX_VDMA_WITH_WATCHDOG
-            vboxWddmWdInit(pDevExt);
-#endif
             /* can enable it right away since the host does not need any screen/FB info
              * for basic DMA functionality */
@@ -1010 +1007 @@
         if (RT_SUCCESS(rc))
         {
-#ifdef VBOX_VDMA_WITH_WATCHDOG
-            vboxWddmWdTerm(pDevExt);
-#endif
             rc = vboxVdmaDestroy(pDevExt, &pDevExt->u.primary.Vdma);
             AssertRC(rc);
@@ -1586 +1580 @@
     if (bOur)
     {
-#ifdef VBOX_VDMA_WITH_WATCHDOG
-        if (flags & HGSMIHOSTFLAGS_WATCHDOG)
-        {
-            Assert(0);
-        }
-#endif
         if (flags & HGSMIHOSTFLAGS_VSYNC)
         {
@@ -1759 +1747 @@
         if (bOur)
         {
-#ifdef VBOX_VDMA_WITH_WATCHDOG
-            if (flags & HGSMIHOSTFLAGS_WATCHDOG)
-            {
-                Assert(0);
-            }
-#endif
             if (flags & HGSMIHOSTFLAGS_VSYNC)
             {