xorg/xc/programs/Xserver/hw/xfree86/drivers/mga
Saren Sandmann Pedersen
sandmann at daimi.au.dk
Fri Aug 13 21:24:09 EEST 2004
CVS commit by sandmann:
Fri Aug 13 19:53:10 2004 Soeren Sandmann <sandmann at redhat.com>
* programs/Xserver/hw/xfree86/drivers/mga/mga_storm.c
(MGAStormSync): Fix for lockups on some versions of Matrox
Mystique. #687, Patch from Mike Harris.
* programs/Xserver/hw/xfree86/common/xf86RandR.c
(xf86RandRSetMode): Call xf86EnableDisableFBAccess though the
function pointer instead of directly. #1041, Patch from Aaron Plattner.
* programs/Xserver/hw/xfree86/common/xf86RandR.c: Swap the
phsyical size of the screen when rotiation. #1050, Patch from
Aaron Plattner.
Fri Aug 13 19:47:12 2004 Soeren Sandmann <sandmann at redhat.com>
* xftint.h: 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.
M +2 -2 xorg/xc/programs/Xserver/hw/xfree86/drivers/mga/mga_storm.c 1.6
--- xorg/xc/programs/Xserver/hw/xfree86/drivers/mga/mga_storm.c #1.5:1.6
@@ -1077,6 +1077,6 @@ 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) */
More information about the xorg-commit
mailing list