xf86-video-ati: Branch '6.12-branch'

[Dave Airlie]

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

New commits:
commit 0a03220810a5fa4eec3f16c3c25bd42dd3b31f1c
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
    
    stable: fix slightly different
    
    Signed-off-by: Dave Airlie <airlied at redhat.com>

diff --git a/src/radeon_driver.c b/src/radeon_driver.c
index 4efd272..2321fe2 100644
--- a/src/radeon_driver.c
+++ b/src/radeon_driver.c
@@ -2057,6 +2057,9 @@ static Bool RADEONPreInitAccel(ScrnInfoPtr pScrn)
     }
 
     info->useEXA = FALSE;
+    /* if we have shadow fb bail */
+    if (info->r600_shadow_fb) 
+	return TRUE;
 
     if (info->ChipFamily >= CHIP_FAMILY_R600) {
 	xf86DrvMsg(pScrn->scrnIndex, X_DEFAULT,