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

[Alex Deucher]

 src/radeon_crtc.c |   13 ++++++++++---
 1 files changed, 10 insertions(+), 3 deletions(-)

New commits:
diff-tree 18857184ffa6847815d349c020b003f8401e36ee (from 3a61453efb4f04492cef823b6dd1273b55c6a785)
Author: Alex Deucher <alex at t41p.hsd1.va.comcast.net>
Date:   Sat May 26 12:27:00 2007 -0400

    RADEON: fix handling of DRI lock

diff --git a/src/radeon_crtc.c b/src/radeon_crtc.c
index 638bdd0..e8a676a 100644
--- a/src/radeon_crtc.c
+++ b/src/radeon_crtc.c
@@ -241,13 +241,20 @@ 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->CPStarted && pScrn->pScreen) {
+	DRILock(pScrn->pScreen, 0);
+	return TRUE;
+    } else {
+	return FALSE;
+    }
 #endif
 
-    if (info->accelOn)
-        RADEON_SYNC(info, pScrn);
     return FALSE;
+
 }
 
 static void