Index: programs/Xserver/hw/xfree86/drivers/mga/mga_storm.c
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/drivers/mga/mga_storm.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -u -r1.5 -r1.6
--- programs/Xserver/hw/xfree86/drivers/mga/mga_storm.c	3 Aug 2004 08:52:16 -0000	1.5
+++ programs/Xserver/hw/xfree86/drivers/mga/mga_storm.c	13 Aug 2004 18:24:08 -0000	1.6
@@ -1076,8 +1076,8 @@
 
     CHECK_DMA_QUIESCENT(pMga, pScrn);
 
-    /* This reportedly causes a freeze for the Mystique. */
-    if (pMga->Chipset != PCI_CHIP_MGA1064)
+    /* MGAISBUSY() reportedly causes a freeze for Mystique revision 2 and older */
+    if (!(pMga->Chipset == PCI_CHIP_MGA1064 && (pMga->ChipRev >= 0 && pMga->ChipRev <= 2)))
 	while(MGAISBUSY());
     /* flush cache before a read (mga-1064g 5.1.6) */
     OUTREG8(MGAREG_CRTC_INDEX, 0);