diff options
| author | Søren Sandmann Pedersen <sandmann@daimi.au.dk> | 2004-08-13 18:24:08 +0000 |
|---|---|---|
| committer | Søren Sandmann Pedersen <sandmann@daimi.au.dk> | 2004-08-13 18:24:08 +0000 |
| commit | f29f2239d31232e152744321c447035ede658ce2 (patch) | |
| tree | 26e70eaa654f45bdcd9d6ffa93bd632cf330a764 /src/mga_storm.c | |
| parent | d9e1c04184e016604a9c84d53970c783f0849d2a (diff) | |
Fri Aug 13 19:53:10 2004 Soeren Sandmann <sandmann@redhat.com>
Fix for lockups on some versions of Matrox Mystique. #687, Patch from Mike
Harris.
Call xf86EnableDisableFBAccess though the function pointer instead of
directly. #1041, Patch from Aaron Plattner.
Swap the phsyical size of the screen when rotiation. #1050, Patch from
Aaron Plattner.
Fri Aug 13 19:47:12 2004 Soeren Sandmann <sandmann@redhat.com>
Make HAVE_FT_BITMAP_SIZE_Y_PPEM conditional on the FreeType version instead
of proping it. This way it will work with the monolithic version too.
#1062, Patch by Owen Taylor.
Diffstat (limited to 'src/mga_storm.c')
| -rw-r--r-- | src/mga_storm.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/mga_storm.c b/src/mga_storm.c index c7acf24..7661596 100644 --- a/src/mga_storm.c +++ b/src/mga_storm.c @@ -1076,8 +1076,8 @@ MGAStormSync(ScrnInfoPtr pScrn) 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); |