Changeset 41636 in vbox for trunk/src/VBox/Devices

Timestamp:

Jun 9, 2012 12:56:51 PM (13 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

78435

Message:

wddm: fix win8 halt issues

Location:

trunk/src/VBox/Devices

Files:

• Graphics/DevVGA.cpp (modified) (2 diffs)
• Graphics/DevVGA.h (modified) (2 diffs)
• Graphics/DevVGA_VBVA.cpp (modified) (3 diffs)
• Graphics/DevVGA_VDMA.cpp (modified) (5 diffs)
• Makefile.kmk (modified) (3 diffs)

trunk/src/VBox/Devices/Graphics/DevVGA.cpp

@@ -2872 +2872 @@
                 {
                     PDMDevHlpPCISetIrq(pDevIns, 0, PDM_IRQ_LEVEL_LOW);
-                    HGSMIClearHostGuestFlags(s->pHGSMI, HGSMIHOSTFLAGS_IRQ);
+                    HGSMIClearHostGuestFlags(s->pHGSMI, HGSMIHOSTFLAGS_IRQ
+#ifdef VBOX_VDMA_WITH_WATCHDOG
+                            | HGSMIHOSTFLAGS_WATCHDOG
+#endif
+                            | HGSMIHOSTFLAGS_VSYNC
+                            );
                 }
                 else
@@ -5256 +5261 @@
     PVGASTATE pThis = (PVGASTATE)pvUser;
     NOREF(pDevIns);
+
+    if (pThis->fScanLineCfg & VBVASCANLINECFG_ENABLE_VSYNC_IRQ)
+    {
+        VBVARaiseIrq(pThis, HGSMIHOSTFLAGS_VSYNC);
+    }
 
     if (pThis->pDrv)

trunk/src/VBox/Devices/Graphics/DevVGA.h

@@ -413 +413 @@
      * adapter, the way it can handle async HGSMI command completion, etc. */
     uint32_t                    fGuestCaps;
+    uint32_t                    fScanLineCfg;
+    uint8_t                     Padding10[4];
 #  else
-    uint8_t                     Padding10[6];
+    uint8_t                     Padding10[14];
 #  endif
 # endif /* VBOX_WITH_HGSMI */
@@ -481 +483 @@
 bool VBVAIsEnabled(PVGASTATE pVGAState);
 
+void VBVARaiseIrq (PVGASTATE pVGAState, uint32_t fFlags);
+
 /* @return host-guest flags that were set on reset
  * this allows the caller to make further cleaning when needed,

trunk/src/VBox/Devices/Graphics/DevVGA_VBVA.cpp

@@ -1623 +1623 @@
 }
 
+void VBVARaiseIrq (PVGASTATE pVGAState, uint32_t fFlags)
+{
+    PPDMDEVINS pDevIns = pVGAState->pDevInsR3;
+    PDMCritSectEnter(&pVGAState->lock, VERR_SEM_BUSY);
+    HGSMISetHostGuestFlags(pVGAState->pHGSMI, HGSMIHOSTFLAGS_IRQ | fFlags);
+    PDMDevHlpPCISetIrq(pDevIns, 0, PDM_IRQ_LEVEL_HIGH);
+    PDMCritSectLeave(&pVGAState->lock);
+}
+
 /*
  *
@@ -1638 +1647 @@
 #if defined(VBOX_WITH_HGSMI) && (defined(VBOX_WITH_VIDEOHWACCEL) || defined(VBOX_WITH_VDMA) || defined(VBOX_WITH_WDDM))
     PVGASTATE pVGAState = (PVGASTATE)pvCallback;
-    PPDMDEVINS pDevIns = pVGAState->pDevInsR3;
-    PDMCritSectEnter(&pVGAState->lock, VERR_SEM_BUSY);
-    HGSMISetHostGuestFlags(pVGAState->pHGSMI, HGSMIHOSTFLAGS_IRQ);
-    PDMDevHlpPCISetIrq(pDevIns, 0, PDM_IRQ_LEVEL_HIGH);
-    PDMCritSectLeave(&pVGAState->lock);
+    VBVARaiseIrq (pVGAState, 0);
 #else
     NOREF(pvCallback);
@@ -1969 +1974 @@
         } break;
 #endif
+        case VBVA_SCANLINE_CFG:
+        {
+            if (cbBuffer < sizeof (VBVASCANLINECFG))
+            {
+                rc = VERR_INVALID_PARAMETER;
+                break;
+            }
+
+            VBVASCANLINECFG *pCfg = (VBVASCANLINECFG*)pvBuffer;
+            pVGAState->fScanLineCfg = pCfg->fFlags;
+            pCfg->rc = VINF_SUCCESS;
+        } break;
         default:
             Log(("Unsupported VBVA guest command %d!!!\n",

trunk/src/VBox/Devices/Graphics/DevVGA_VDMA.cpp

@@ -83 +83 @@
     PHGSMIINSTANCE pHgsmi;
     PVGASTATE pVGAState;
+#ifdef VBOX_VDMA_WITH_WATCHDOG
+    PTMTIMERR3 WatchDogTimer;
+#endif
 #ifdef VBOX_VDMA_WITH_WORKERTHREAD
     VBOXVDMAPIPE Pipe;
@@ -1085 +1088 @@
 #endif
 
+#ifdef VBOX_VDMA_WITH_WATCHDOG
+static DECLCALLBACK(void) vboxVDMAWatchDogTimer(PPDMDEVINS pDevIns, PTMTIMER pTimer, void *pvUser)
+{
+    VBOXVDMAHOST *pVdma = (VBOXVDMAHOST *)pvUser;
+    PVGASTATE pVGAState = pVdma->pVGAState;
+    VBVARaiseIrq(pVGAState, HGSMIHOSTFLAGS_WATCHDOG);
+}
+
+static int vboxVDMAWatchDogCtl(struct VBOXVDMAHOST *pVdma, uint32_t cMillis)
+{
+    PPDMDEVINS pDevIns = pVdma->pVGAState->pDevInsR3;
+    if (cMillis)
+        TMTimerSetMillies(pVdma->WatchDogTimer, cMillis);
+    else
+        TMTimerStop(pVdma->WatchDogTimer);
+    return VINF_SUCCESS;
+}
+#endif
+
 int vboxVDMAConstruct(PVGASTATE pVGAState, uint32_t cPipeElements)
 {
@@ -1098 +1120 @@
         pVdma->pHgsmi = pVGAState->pHGSMI;
         pVdma->pVGAState = pVGAState;
+
+#ifdef VBOX_VDMA_WITH_WATCHDOG
+        rc = PDMDevHlpTMTimerCreate(pVGAState->pDevInsR3, TMCLOCK_REAL, vboxVDMAWatchDogTimer,
+                                    pVdma, TMTIMER_FLAGS_NO_CRIT_SECT,
+                                    "VDMA WatchDog Timer", &pVdma->WatchDogTimer);
+        AssertRC(rc);
+#endif
 #ifdef VBOX_VDMA_WITH_WORKERTHREAD
         hgsmiListInit(&pVdma->PendingList);
@@ -1227 +1256 @@
 }
 
-
 void vboxVDMAControl(struct VBOXVDMAHOST *pVdma, PVBOXVDMA_CTL pCmd, uint32_t cbCmd)
 {
@@ -1244 +1272 @@
             pCmd->i32Result = VINF_SUCCESS;
             break;
+#ifdef VBOX_VDMA_WITH_WATCHDOG
+        case VBOXVDMA_CTL_TYPE_WATCHDOG:
+            pCmd->i32Result = vboxVDMAWatchDogCtl(pVdma, pCmd->u32Offset);
+            break;
+#endif
         default:
             AssertBreakpoint();

trunk/src/VBox/Devices/Makefile.kmk

@@ -254 +254 @@
         Graphics/DevVGA_VDMA.cpp
  endif
+ 
+ ifdef VBOX_VDMA_WITH_WATCHDOG
+  VBoxDD_DEFS           += VBOX_VDMA_WITH_WATCHDOG
+ endif
 
  ifdef VBOX_WITH_PXE_ROM
@@ -829 +833 @@
    VBoxDDGC_DEFS        += VBOX_WITH_CRHGSMI
   endif
-
   ifdef VBOXWDDM_WITH_VBVA
    VBoxDDGC_DEFS        += VBOXWDDM_WITH_VBVA
+  endif
+  ifdef VBOX_VDMA_WITH_WATCHDOG
+   VBoxDDGC_DEFS        += VBOX_VDMA_WITH_WATCHDOG
   endif
 
@@ -977 +983 @@
   VBoxDDR0_DEFS         += VBOXWDDM_WITH_VBVA
  endif
+ ifdef VBOX_VDMA_WITH_WATCHDOG
+  VBoxDDR0_DEFS        += VBOX_VDMA_WITH_WATCHDOG
+ endif
 
  ifdef VBOX_WITH_VUSB