xf86-video-ati: Branch 'randr-1.2'

[Alex Deucher]

 src/radeon_crtc.c |    9 ++++-----
 1 files changed, 4 insertions(+), 5 deletions(-)

New commits:
diff-tree c4cef0c9481257a744ac99dfc7beb988ce51a8ee (from 899c62e987d5c7524817ba85675e39a8a28e0232)
Author: Alex Deucher <alex at t41p.hsd1.va.comcast.net>
Date:   Sat May 26 13:12:37 2007 -0400

    RADEON: make sure we have the lock when SYNCing

diff --git a/src/radeon_crtc.c b/src/radeon_crtc.c
index e8a676a..621d811 100644
--- a/src/radeon_crtc.c
+++ b/src/radeon_crtc.c
@@ -241,17 +241,16 @@ radeon_crtc_lock(xf86CrtcPtr crtc)
     RADEONInfoPtr  info = RADEONPTR(pScrn);
     Bool           CPStarted   = info->CPStarted;
 
-    if (info->accelOn)
-        RADEON_SYNC(info, pScrn);
-
 #ifdef XF86DRI
     if (info->CPStarted && pScrn->pScreen) {
 	DRILock(pScrn->pScreen, 0);
+	if (info->accelOn)
+	    RADEON_SYNC(info, pScrn);
 	return TRUE;
-    } else {
-	return FALSE;
     }
 #endif
+    if (info->accelOn)
+        RADEON_SYNC(info, pScrn);
 
     return FALSE;