diff options
| author | Kaleb Keithley <kaleb@freedesktop.org> | 2004-02-23 20:35:03 +0000 |
|---|---|---|
| committer | Kaleb Keithley <kaleb@freedesktop.org> | 2004-02-23 20:35:03 +0000 |
| commit | 64c0cb99b62c87052374f63d3e31e2603eab2f9c (patch) | |
| tree | 74afef7eee3ae9f95fad4888d3565e1ff88c5899 /src | |
| parent | bf37df17ecf040836ad8924a9174787d0f57ed5a (diff) | |
Import most of XFree86 4.4RC3. This import excludes files which have thexf86-4_3_99_903_special
new license. If we want to, later we can import 4.4RC3 again and pick
up the files that have the new license, but for now the vendor branch
is "pure."
Diffstat (limited to 'src')
| -rw-r--r-- | src/mga_storm.c | 6 |
1 files 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) { |