xf86-video-ati: Branch 'master'

[Dave Airlie]

 src/radeon_driver.c |    6 ++++++
 1 file changed, 6 insertions(+)

New commits:
commit 447a2ce1b88aa2d6d5713e93174c4002617720f7
Author: Dave Airlie <airlied at redhat.com>
Date:   Thu Jul 30 09:54:01 2009 +1000

    radeon: fix r600 shadow fb mode with cursor allocation in wrong place
    
    From RHEL QE testing, we could end up with the cursor at 0 since
    we think EXA is in use when really it isn't. the info->useEXA = FALSe
    might be unnecessary but better to be explicit
    
    Signed-off-by: Dave Airlie <airlied at redhat.com>

diff --git a/src/radeon_driver.c b/src/radeon_driver.c
index 979b1ad..049047a 100644
--- a/src/radeon_driver.c
+++ b/src/radeon_driver.c
@@ -2103,6 +2103,12 @@ static Bool RADEONPreInitAccel(ScrnInfoPtr pScrn)
 	info->accel_state->has_tcl = TRUE;
     }
 
+    /* if we have shadow fb bail */
+    if (info->r600_shadow_fb) {
+	info->useEXA = FALSE;
+	return TRUE;
+    }
+
     info->useEXA = TRUE;
 
     if (!xf86ReturnOptValBool(info->Options, OPTION_NOACCEL, FALSE)) {