From 03f00bf8411e6c36d3aef1907e42a52854353101 Mon Sep 17 00:00:00 2001
From: Kaleb Keithley <kaleb@freedesktop.org>
Date: Mon, 23 Feb 2004 21:35:32 +0000
Subject: merge most of XFree86 RC3 (4.3.99.903) from vendor branch. bug #214

---
 src/mga_storm.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/mga_storm.c b/src/mga_storm.c
index ff083ac..1ddbed9 100644
--- a/src/mga_storm.c
+++ b/src/mga_storm.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/mga/mga_storm.c,v 1.98 2003/01/16 16:09:10 eich Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/mga/mga_storm.c,v 1.99 2004/01/29 03:28:25 dawes Exp $ */
 
 
 /* All drivers should typically include these */
@@ -1076,7 +1076,9 @@ MGAStormSync(ScrnInfoPtr pScrn)
 
     CHECK_DMA_QUIESCENT(pMga, pScrn);
 
-    while(MGAISBUSY());
+    /* This reportedly causes a freeze for the Mystique. */
+    if (pMga->Chipset != PCI_CHIP_MGA1064)
+	while(MGAISBUSY());
     /* flush cache before a read (mga-1064g 5.1.6) */
     OUTREG8(MGAREG_CRTC_INDEX, 0);
     if(pMga->AccelFlags & CLIPPER_ON) {
-- 
cgit v1.2.3