diff options
| author | Vladimir Dergachev <volodya@mindspring.com> | 2005-03-17 03:36:25 +0000 |
|---|---|---|
| committer | Vladimir Dergachev <volodya@mindspring.com> | 2005-03-17 03:36:25 +0000 |
| commit | b56a5f96048b920a7751318dde211e881f53b2bb (patch) | |
| tree | 6eab3ba9daf9dda46c4abafb9140df515b9381c6 | |
| parent | 01a9c1157cdfbc5f74b035383e060b8419979563 (diff) | |
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
| -rw-r--r-- | src/radeon_mergedfb.c | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/src/radeon_mergedfb.c b/src/radeon_mergedfb.c index 89bc19f..741edff 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 */ |