Changeset 24926 in vbox for trunk/src

Timestamp:

Nov 25, 2009 8:34:23 AM (15 years ago)

Author:

vboxsync

Message:

2d accel: clear the Graphics Device IRQ in case it is set on reset

Location:

trunk/src/VBox/Devices/Graphics

Files:

• DevVGA.h (modified) (1 diff)
• DevVGA_VBVA.cpp (modified) (1 diff)
• HGSMI/HGSMIHost.cpp (modified) (2 diffs)

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

@@ -463 +463 @@
 int      VBVAUpdateDisplay (PVGASTATE pVGAState);
 void     VBVAReset (PVGASTATE pVGAState);
-void     HGSMIReset (PHGSMIINSTANCE pIns);
+/* @return host-guest flags that were set on reset
+ * this allows the caller to make further cleaning when needed,
+ * e.g. reset the IRQ */
+uint32_t HGSMIReset (PHGSMIINSTANCE pIns);
 
 # ifdef VBOX_WITH_VIDEOHWACCEL

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

@@ -1558 +1558 @@
 #endif
 
-    HGSMIReset (pVGAState->pHGSMI);
+    uint32_t HgFlags = HGSMIReset (pVGAState->pHGSMI);
+    if(HgFlags & HGSMIHOSTFLAGS_IRQ)
+    {
+        /* this means the IRQ is LEVEL_HIGH, need to reset it */
+        PDMDevHlpPCISetIrq(pVGAState->pDevInsR3, 0, PDM_IRQ_LEVEL_LOW);
+    }
 
     if (pCtx)

trunk/src/VBox/Devices/Graphics/HGSMI/HGSMIHost.cpp

@@ -1538 +1538 @@
 }
 
-void HGSMIReset (PHGSMIINSTANCE pIns)
-{
+uint32_t HGSMIReset (PHGSMIINSTANCE pIns)
+{
+    uint32_t flags = 0;
     if(pIns->pHGFlags)
     {
         /* treat the abandoned commands as read.. */
         while(HGSMIHostRead (pIns) != HGSMIOFFSET_VOID)  {}
+        flags = pIns->pHGFlags->u32HostFlags;
+        pIns->pHGFlags->u32HostFlags = 0;
     }
 
@@ -1550 +1553 @@
 
     HGSMIHeapSetupUnitialized (&pIns->hostHeap);
+
+    return flags;
 }