From 2a7c8577f5269c94e47e7922be64b97a8d45d21f Mon Sep 17 00:00:00 2001
From: Kurt Daverman <krd@vmware.com>
Date: Tue, 12 Oct 2010 19:35:42 +0000
Subject: [PATCH] Metalkit test 2dmark can trigger VMX host panic when it
 detects SVGA FIFO is re-initialized while vmx is processing it.  To fix this
 issue, I suggest metalkit SVGA_SetMode should handle mode transitions and new
 function SVGA_Enable should initialize the FIFO.

---
 lib/refdriver/svga.c | 60 +++++++++++++++++++++++++++++++-------------
 lib/refdriver/svga.h |  2 ++
 2 files changed, 44 insertions(+), 18 deletions(-)

diff --git a/lib/refdriver/svga.c b/lib/refdriver/svga.c
index b6e594d..830ff0b 100644
--- a/lib/refdriver/svga.c
+++ b/lib/refdriver/svga.c
@@ -116,6 +116,7 @@ SVGA_Init(void)
     * does not support the FIFO buffer at all.
     */
 
+   gSVGA.vramSize = SVGA_ReadReg(SVGA_REG_VRAM_SIZE);
    gSVGA.fbSize = SVGA_ReadReg(SVGA_REG_FB_SIZE);
    gSVGA.fifoSize = SVGA_ReadReg(SVGA_REG_MEM_SIZE);
 
@@ -163,41 +164,30 @@ SVGA_Init(void)
       Intr_SetHandler(IRQ_VECTOR(irq), SVGAInterruptHandler);
       Intr_SetMask(irq, TRUE);
    }
+
+   SVGA_Enable();
 }
 
 
 /*
  *-----------------------------------------------------------------------------
  *
- * SVGA_SetMode --
+ * SVGA_Enable --
  *
- *      This switches to SVGA video mode, and enables the command FIFO.
+ *      Enable the SVGA device along with the SVGA FIFO.
  *
  * Results:
  *      void.
  *
  * Side effects:
- *      Switches modes. Disables legacy video modes (VGA, VBE).
- *      Clears the command FIFO, and asks the host to start processing it.
+ *      Initializes the command FIFO.
  *
  *-----------------------------------------------------------------------------
  */
 
 void
-SVGA_SetMode(uint32 width,   // IN
-             uint32 height,  // IN
-             uint32 bpp)     // IN
+SVGA_Enable(void)
 {
-   gSVGA.width = width;
-   gSVGA.height = height;
-   gSVGA.bpp = bpp;
-
-   SVGA_WriteReg(SVGA_REG_WIDTH, width);
-   SVGA_WriteReg(SVGA_REG_HEIGHT, height);
-   SVGA_WriteReg(SVGA_REG_BITS_PER_PIXEL, bpp);
-   SVGA_WriteReg(SVGA_REG_ENABLE, TRUE);
-   gSVGA.pitch = SVGA_ReadReg(SVGA_REG_BYTES_PER_LINE);
-
    /*
     * Initialize the command FIFO. The beginning of FIFO memory is
     * used for an additional set of registers, the "FIFO registers".
@@ -226,9 +216,10 @@ SVGA_SetMode(uint32 width,   // IN
    }
 
    /*
-    * Enable the FIFO.
+    * Enable the SVGA device and FIFO.
     */
 
+   SVGA_WriteReg(SVGA_REG_ENABLE, TRUE);
    SVGA_WriteReg(SVGA_REG_CONFIG_DONE, TRUE);
 
    /*
@@ -288,6 +279,39 @@ SVGA_Disable(void)
 }
 
 
+/*
+ *-----------------------------------------------------------------------------
+ *
+ * SVGA_SetMode --
+ *
+ *      This switches the SVGA video mode and enables SVGA device.
+ *
+ * Results:
+ *      void.
+ *
+ * Side effects:
+ *      Transitions to SVGA mode if SVGA device currently disabled.
+ *
+ *-----------------------------------------------------------------------------
+ */
+
+void
+SVGA_SetMode(uint32 width,   // IN
+             uint32 height,  // IN
+             uint32 bpp)     // IN
+{
+   gSVGA.width = width;
+   gSVGA.height = height;
+   gSVGA.bpp = bpp;
+
+   SVGA_WriteReg(SVGA_REG_WIDTH, width);
+   SVGA_WriteReg(SVGA_REG_HEIGHT, height);
+   SVGA_WriteReg(SVGA_REG_BITS_PER_PIXEL, bpp);
+   SVGA_WriteReg(SVGA_REG_ENABLE, TRUE);
+   gSVGA.pitch = SVGA_ReadReg(SVGA_REG_BYTES_PER_LINE);
+}
+
+
 /*
  *-----------------------------------------------------------------------------
  *
diff --git a/lib/refdriver/svga.h b/lib/refdriver/svga.h
index eab98a6..1936a25 100644
--- a/lib/refdriver/svga.h
+++ b/lib/refdriver/svga.h
@@ -53,6 +53,7 @@ typedef struct SVGADevice {
    uint8     *fbMem;
    uint32     fifoSize;
    uint32     fbSize;
+   uint32     vramSize;
 
    uint32     deviceVersionId;
    uint32     capabilities;
@@ -82,6 +83,7 @@ typedef struct SVGADevice {
 extern SVGADevice gSVGA;
 
 void SVGA_Init(void);
+void SVGA_Enable(void);
 void SVGA_SetMode(uint32 width, uint32 height, uint32 bpp);
 void SVGA_Disable(void);
 void SVGA_Panic(const char *err);