Changeset 13401 in vbox for trunk/src

Timestamp:

Oct 20, 2008 3:46:38 PM (16 years ago)

Author:

vboxsync

Message:

Cleaned up

Location:

trunk/src/VBox/Devices/Graphics

Files:

• DevVGA.cpp (modified) (15 diffs)
• DevVGA.h (modified) (1 diff)

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

@@ -349 +349 @@
     AssertMsg(offVRAM < pThis->vram_size, ("offVRAM = %p, pThis->vram_size = %p\n", offVRAM, pThis->vram_size));
     ASMBitSet(&pThis->au32DirtyBitmap[0], offVRAM >> PAGE_SHIFT);
-    pThis->fHaveDirtyBits = true;
+    pThis->fHasDirtyBits = true;
 }
 
@@ -684 +684 @@
 #endif
         s->sr[s->sr_index] = val & sr_mask[s->sr_index];
+
+#ifndef IN_GC
+        /* The VGA region is (could be) affected by this change; reset all aliases we've created. */
+        if (    s->sr_index == 4 /* mode */
+            ||  s->sr_index == 2 /* plane mask */)
+        {
+            if (s->fRemappedVGA)
+            {
+                IOMMMIOResetRegion(PDMDevHlpGetVM(s->CTX_SUFF(pDevIns)), 0x000a0000);
+                s->fRemappedVGA = false;
+            }
+        }
+#endif
         break;
     case 0x3c7:
@@ -711 +724 @@
 #endif
         s->gr[s->gr_index] = val & gr_mask[s->gr_index];
+
+#ifndef IN_GC
+        /* The VGA region is (could be) affected by this change; reset all aliases we've created. */
+        if (s->gr_index == 6 /* memory map mode */)
+        {
+            if (s->fRemappedVGA)
+            {
+                IOMMMIOResetRegion(PDMDevHlpGetVM(s->CTX_SUFF(pDevIns)), 0x000a0000);
+                s->fRemappedVGA = false;
+            }
+        }
+#endif
         break;
+
     case 0x3b4:
     case 0x3d4:
@@ -880 +906 @@
             s->vbe_regs[s->vbe_index] = val;
             s->bank_offset = (val << 16);
-            break;
+
+#ifndef IN_GC
+            /* The VGA region is (could be) affected by this change; reset all aliases we've created. */
+            if (s->fRemappedVGA)
+            {
+                IOMMMIOResetRegion(PDMDevHlpGetVM(s->CTX_SUFF(pDevIns)), 0x000a0000);
+                s->fRemappedVGA = false;
+            }
+#endif
+            break;
+
         case VBE_DISPI_INDEX_ENABLE:
 #ifndef IN_RING3
@@ -1001 +1037 @@
              */
             s->pDrv->pfnLFBModeChange(s->pDrv, (val & VBE_DISPI_ENABLED) != 0);
+
+            /* The VGA region is (could be) affected by this change; reset all aliases we've created. */
+            if (s->fRemappedVGA)
+            {
+                IOMMMIOResetRegion(PDMDevHlpGetVM(s->CTX_SUFF(pDevIns)), 0x000a0000);
+                s->fRemappedVGA = false;
+            }
             break;
 #endif /* IN_RING3 */
@@ -1081 +1124 @@
     /* convert to VGA memory offset */
     memory_map_mode = (s->gr[6] >> 2) & 3;
+#ifdef VBOX
+    RTGCPHYS GCPhys = addr; /* save original address */
+#endif
     addr &= 0x1ffff;
     switch(memory_map_mode) {
@@ -1114 +1160 @@
 #else /* VBOX */
         ret = s->CTX_SUFF(vram_ptr)[addr];
+# ifdef IN_RING0
+        /* If all planes are accessible, then map the page to the frame buffer and make it writable. */
+        if ((s->sr[2] & 3) == 3)
+        {
+            IOMMMIOModifyPage(PDMDevHlpGetVM(s->CTX_SUFF(pDevIns)), GCPhys, s->GCPhysVRAM + addr, X86_PTE_RW | X86_PTE_P);
+            s->fRemappedVGA = true;
+        }
+# endif /* IN_RING0 */
 #endif /* VBOX */
     } else if (!(s->sr[4] & 0x04)) {    /* Host access is controlled by SR4, not GR5! */
@@ -1197 +1251 @@
     /* convert to VGA memory offset */
     memory_map_mode = (s->gr[6] >> 2) & 3;
+#ifdef VBOX
+    RTGCPHYS GCPhys = addr; /* save original address */
+#endif
     addr &= 0x1ffff;
     switch(memory_map_mode) {
@@ -1227 +1284 @@
             s->vram_ptr[addr] = val;
 #else /* VBOX */
-#ifdef IN_GC
+# ifdef IN_GC
             if (addr >= VGA_MAPPING_SIZE)
                 return VINF_IOM_HC_MMIO_WRITE;
-#else
+# else
             if (addr >= s->vram_size)
             {
@@ -1237 +1294 @@
                 return VINF_SUCCESS;
             }
-#endif
+# endif
             s->CTX_SUFF(vram_ptr)[addr] = val;
+
+# ifdef IN_RING0
+            /* If all planes are accessible, then map the page to the frame buffer and make it writable. */
+            if ((s->sr[2] & 3) == 3)
+            {
+                IOMMMIOModifyPage(PDMDevHlpGetVM(s->CTX_SUFF(pDevIns)), GCPhys, s->GCPhysVRAM + addr, X86_PTE_RW | X86_PTE_P);
+                s->fRemappedVGA = true;
+            }
+# endif /* IN_RING0 */
+
 #endif /* VBOX */
 #ifdef DEBUG_VGA_MEM
@@ -4326 +4393 @@
     PVGASTATE pThis = IDISPLAYPORT_2_VGASTATE(pInterface);
     PDMDEV_ASSERT_EMT(VGASTATE2DEVINS(pThis));
+    PPDMDEVINS pDevIns = pThis->CTX_SUFF(pDevIns);
 
 #ifdef DEBUG_sunlover
@@ -4337 +4405 @@
         return rc;
 
-    if (pThis->fHaveDirtyBits && pThis->GCPhysVRAM && pThis->GCPhysVRAM != NIL_RTGCPHYS32)
-    {
-        PPDMDEVINS pDevIns = pThis->CTX_SUFF(pDevIns);
+    if (    pThis->fHasDirtyBits 
+        &&  pThis->GCPhysVRAM 
+        &&  pThis->GCPhysVRAM != NIL_RTGCPHYS32)
+    {
         PGMHandlerPhysicalReset(PDMDevHlpGetVM(pDevIns), pThis->GCPhysVRAM);
-        pThis->fHaveDirtyBits = false;
+        pThis->fHasDirtyBits = false;
+    }
+    if (pThis->fRemappedVGA)
+    {
+        IOMMMIOResetRegion(PDMDevHlpGetVM(pDevIns), 0x000a0000);
+        pThis->fRemappedVGA = false;
     }
 
@@ -4358 +4432 @@
     PVGASTATE pThis = IDISPLAYPORT_2_VGASTATE(pInterface);
     PDMDEV_ASSERT_EMT(VGASTATE2DEVINS(pThis));
+    PPDMDEVINS pDevIns = pThis->CTX_SUFF(pDevIns);
 
     /* This is called both in VBVA mode and normal modes. */
@@ -4370 +4445 @@
 
     /* The dirty bits array has been just cleared, reset handlers as well. */
-    if (pThis->GCPhysVRAM && pThis->GCPhysVRAM != NIL_RTGCPHYS32)
-    {
-        PPDMDEVINS pDevIns = pThis->CTX_SUFF(pDevIns);
+    if (    pThis->GCPhysVRAM 
+        &&  pThis->GCPhysVRAM != NIL_RTGCPHYS32)
+    {
         PGMHandlerPhysicalReset(PDMDevHlpGetVM(pDevIns), pThis->GCPhysVRAM);
+    }
+    if (pThis->fRemappedVGA)
+    {
+        IOMMMIOResetRegion(PDMDevHlpGetVM(pDevIns), 0x000a0000);
+        pThis->fRemappedVGA = false;
     }
 
@@ -4985 +5065 @@
         int rc = PGMHandlerPhysicalReset(PDMDevHlpGetVM(pDevIns), pThis->GCPhysVRAM);
         AssertRC(rc);
+    }
+    if (pThis->fRemappedVGA)
+    {
+        IOMMMIOResetRegion(PDMDevHlpGetVM(pDevIns), 0x000a0000);
+        pThis->fRemappedVGA = false;
     }
 

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

@@ -261 +261 @@
     bool                        fR0Enabled;
     /** Flag indicating that there are dirty bits. This is used to optimize the handler resetting. */
-    bool                        fHaveDirtyBits;
+    bool                        fHasDirtyBits;
+    /** Flag indicating that the VGA memory in the 0xa0000-0xbffff region has been remapped to allow direct access. */
+    bool                        fRemappedVGA;
+    bool                        padding9[3];
+
     /** Pointer to vgaGCLFBAccessHandler(). */
     RTRCPTR                     RCPtrLFBHandler;