From b56a5f96048b920a7751318dde211e881f53b2bb Mon Sep 17 00:00:00 2001 From: Vladimir Dergachev Date: Thu, 17 Mar 2005 03:36:25 +0000 Subject: Modified: programs/Xserver/hw/xfree86/drivers/ati/radeon_mergedfb.c Back out RadeonWaitForIdleMMIO that I put in earlier. From discussion on dri-devel we do not need to be as careful with INREG() access on Radeons as we are on mach64 chips. The fix is backed out due to: it breaks DRI on SMP systems (due to absense of the lock in mouse handling functions) I am no longer able to reproduce the lockup I saw before --- src/radeon_mergedfb.c | 8 -------- 1 file changed, 8 deletions(-) diff --git a/src/radeon_mergedfb.c b/src/radeon_mergedfb.c index 89bc19fa..741edffe 100644 --- a/src/radeon_mergedfb.c +++ b/src/radeon_mergedfb.c @@ -1443,14 +1443,6 @@ RADEONChooseCursorCRTC(ScrnInfoPtr pScrn1, int x, int y) RADEONScrn2Rel srel = ((RADEONMergedDisplayModePtr)info->CurrentLayout.mode->Private)->CRT2Position; ScrnInfoPtr pScrn2 = info->CRT2pScrn; - - /* - Note: we need WaitForIdle here because OUTREGP() involves an INREG() to obtain a previous - value. This fix is needed for RV350 + 3d driver (or we get a lockup otherwise). - - It is also indicated by documentation (we should not be doing INREG if CP engine is active) - */ - RADEONWaitForIdleMMIO(pScrn1); if (srel == radeonClone) { /* show cursor 2 */ -- cgit v1.2.3