Changeset 55795 in vbox

Timestamp:

May 10, 2015 5:43:38 PM (9 years ago)

Author:

vboxsync

Message:

VMSVGA: Hack to make the 2dmark results appear. Extended 'info vga'.

Location:

trunk/src/VBox/Devices/Graphics

Files:

• DevVGA-SVGA.h (modified) (1 diff)
• DevVGA.cpp (modified) (11 diffs)
• DevVGA.h (modified) (1 diff)

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

@@ -27 +27 @@
 /** Maximum nr of GMR ids. */
 #define VMSVGA_MAX_GMR_IDS              0x100
-/** Size of the region to backup when switching into svga mode. */
-#define VMSVGA_FRAMEBUFFER_BACKUP_SIZE  (32*1024)
 
 #define VMSVGA_VAL_UNINITIALIZED        (unsigned)-1

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

@@ -103 +103 @@
     } while (0)
 #endif
+
+/** @def VBOX_WITH_VMSVGA_BACKUP_VGA_FB
+ * Enables correct VGA MMIO read/write handling when VMSVGA is enabled.  It
+ * is SLOW and probably not entirely right, but it helps with getting 3dmark
+ * output and other stuff. */
+#define VBOX_WITH_VMSVGA_BACKUP_VGA_FB 1
 
 
@@ -1193 +1199 @@
 #endif
 
+#if !defined(IN_RING3) && defined(VBOX_WITH_VMSVGA) && defined(VBOX_WITH_VMSVGA_BACKUP_VGA_FB) /** @todo figure out the right way */
+    /* Ugly hack to get result from 2dmark and other vmsvga examples. */
+    if (pThis->svga.fEnabled)
+        return VINF_IOM_R3_MMIO_READ;
+#endif
+
     addr &= 0x1ffff;
     switch(memory_map_mode) {
@@ -1232 +1244 @@
 # endif /* IN_RC */
         VERIFY_VRAM_READ_OFF_RETURN(pThis, addr, *prc);
-        ret = pThis->CTX_SUFF(vram_ptr)[addr];
+#if defined(IN_RING3) && defined(VBOX_WITH_VMSVGA) && defined(VBOX_WITH_VMSVGA_BACKUP_VGA_FB) /** @todo figure out the right way */
+        if (pThis->svga.fEnabled && addr < _32K)
+            ret = ((uint8_t *)pThis->svga.pFrameBufferBackup)[addr];
+        else
+#endif
+            ret = pThis->CTX_SUFF(vram_ptr)[addr];
     } else if (!(pThis->sr[4] & 0x04)) {    /* Host access is controlled by SR4, not GR5! */
         /* odd/even mode (aka text mode mapping) */
@@ -1239 +1256 @@
         RTGCPHYS off = ((addr & ~1) << 2) | plane;
         VERIFY_VRAM_READ_OFF_RETURN(pThis, off, *prc);
-        ret = pThis->CTX_SUFF(vram_ptr)[off];
+#if defined(IN_RING3) && defined(VBOX_WITH_VMSVGA) && defined(VBOX_WITH_VMSVGA_BACKUP_VGA_FB) /** @todo figure out the right way */
+        if (pThis->svga.fEnabled && off < _32K)
+            ret = ((uint8_t *)pThis->svga.pFrameBufferBackup)[off];
+        else
+#endif
+            ret = pThis->CTX_SUFF(vram_ptr)[off];
     } else {
         /* standard VGA latched access */
-        VERIFY_VRAM_READ_OFF_RETURN(pThis, addr, *prc);
-        pThis->latch = ((uint32_t *)pThis->CTX_SUFF(vram_ptr))[addr];
+        VERIFY_VRAM_READ_OFF_RETURN(pThis, addr, *prc); /** @todo wrong check! Missing addr*4.  */
+#if defined(IN_RING3) && defined(VBOX_WITH_VMSVGA) && defined(VBOX_WITH_VMSVGA_BACKUP_VGA_FB) /** @todo figure out the right way */
+        if (pThis->svga.fEnabled && addr * 4 + 3 < _32K)
+            pThis->latch = ((uint32_t *)pThis->svga.pFrameBufferBackup)[addr];
+        else
+#endif
+            pThis->latch = ((uint32_t *)pThis->CTX_SUFF(vram_ptr))[addr];
 
         if (!(pThis->gr[5] & 0x08)) {
@@ -1272 +1299 @@
 #ifndef IN_RC
     RTGCPHYS GCPhys = addr; /* save original address */
+#endif
+
+#if !defined(IN_RING3) && defined(VBOX_WITH_VMSVGA) && defined(VBOX_WITH_VMSVGA_BACKUP_VGA_FB) /** @todo figure out the right way */
+    /* Ugly hack to get result from 2dmark and other vmsvga examples. */
+    if (pThis->svga.fEnabled)
+        return VINF_IOM_R3_MMIO_WRITE;
 #endif
 
@@ -1314 +1347 @@
 
             VERIFY_VRAM_WRITE_OFF_RETURN(pThis, addr);
-            pThis->CTX_SUFF(vram_ptr)[addr] = val;
+#if defined(IN_RING3) && defined(VBOX_WITH_VMSVGA) && defined(VBOX_WITH_VMSVGA_BACKUP_VGA_FB) /** @todo figure out the right way */
+            if (pThis->svga.fEnabled && addr < _32K)
+                ((uint8_t *)pThis->svga.pFrameBufferBackup)[addr] = val;
+            else
+#endif
+                pThis->CTX_SUFF(vram_ptr)[addr] = val;
             Log3(("vga: chain4: [0x%x]\n", addr));
             pThis->plane_updated |= mask; /* only used to detect font change */
@@ -1331 +1369 @@
             addr = ((addr & ~1) << 2) | plane;
             VERIFY_VRAM_WRITE_OFF_RETURN(pThis, addr);
-            pThis->CTX_SUFF(vram_ptr)[addr] = val;
+#if defined(IN_RING3) && defined(VBOX_WITH_VMSVGA) && defined(VBOX_WITH_VMSVGA_BACKUP_VGA_FB) /** @todo figure out the right way */
+            if (pThis->svga.fEnabled && addr < _32K)
+                ((uint8_t *)pThis->svga.pFrameBufferBackup)[addr] = val;
+            else
+#endif
+                pThis->CTX_SUFF(vram_ptr)[addr] = val;
             Log3(("vga: odd/even: [0x%x]\n", addr));
             pThis->plane_updated |= mask; /* only used to detect font change */
@@ -1442 +1485 @@
         pThis->plane_updated |= mask; /* only used to detect font change */
         write_mask = mask16[mask];
-        ((uint32_t *)pThis->CTX_SUFF(vram_ptr))[addr] =
-            (((uint32_t *)pThis->CTX_SUFF(vram_ptr))[addr] & ~write_mask) |
+#if defined(IN_RING3) && defined(VBOX_WITH_VMSVGA) && defined(VBOX_WITH_VMSVGA_BACKUP_VGA_FB) /** @todo figure out the right way */
+        if (pThis->svga.fEnabled && addr * 4 + 3U < _32K)
+            ((uint32_t *)pThis->svga.pFrameBufferBackup)[addr] =
+                (((uint32_t *)pThis->svga.pFrameBufferBackup)[addr] & ~write_mask) | (val & write_mask);
+        else
+#endif
+            ((uint32_t *)pThis->CTX_SUFF(vram_ptr))[addr] =
+                (((uint32_t *)pThis->CTX_SUFF(vram_ptr))[addr] & ~write_mask) |
             (val & write_mask);
             Log3(("vga: latch: [0x%x] mask=0x%08x val=0x%08x\n",
@@ -4106 +4155 @@
         pHlp->pfnPrintf(pHlp, "char height %d\n", val);
         pHlp->pfnPrintf(pHlp, "text mode %dx%d\n", w / char_dots, h / (char_height << double_scan));
+
+        uint32_t cbLine;
+        uint32_t offStart;
+        uint32_t uLineCompareIgn;
+        vga_get_offsets(pThis, &cbLine, &offStart, &uLineCompareIgn);
+        if (!cbLine)
+            cbLine = 80 * 8;
+        offStart *= 8;
+        pHlp->pfnPrintf(pHlp, "cbLine:   %#x\n", cbLine);
+        pHlp->pfnPrintf(pHlp, "offStart: %#x (line %#x)\n", offStart, offStart / cbLine);
     }
     if (pThis->fRealRetrace)
@@ -4126 +4185 @@
     }
     pHlp->pfnPrintf(pHlp, "display refresh interval: %u ms\n", pThis->cMilliesRefreshInterval);
+
+#ifdef VBOX_WITH_VMSVGA
+    if (pThis->svga.fEnabled) {
+        pHlp->pfnPrintf(pHlp, pThis->svga.f3DEnabled ? "VMSVGA 3D enabled: %ux%ux%u\n" : "VMSVGA enabled: %ux%ux%u",
+                        pThis->svga.uWidth, pThis->svga.uHeight, pThis->svga.uBpp);
+    }
+#endif
 }
 
@@ -4263 +4329 @@
              *       frame buffer is done intentionally so that we're more
              *       likely to obtain the full scrollback of a linux panic.
+             * windbg> .printf "------ start -----\n"; .for (r $t0 = 0; @$t0 < 25; r $t0 = @$t0 + 1) { .for (r $t1 = 0; @$t1 < 80; r $t1 = @$t1 + 1) { .printf "%c", by( (@$t0 * 80 + @$t1) * 8 + 100f0000) }; .printf "\n" }; .printf "------ end -----\n";
              */
             uint32_t cbLine;

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

@@ -219 +219 @@
 #define VMSVGA_FIFO_EXTCMD_LOADSTATE            3
 #define VMSVGA_FIFO_EXTCMD_RESET                4
+
+/** Size of the region to backup when switching into svga mode. */
+#define VMSVGA_FRAMEBUFFER_BACKUP_SIZE  (32*1024)
 
 typedef struct