xf86-video-ati: Branch 'master'

[Dave Airlie]

 src/radeon_kms.c |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit ba99a82ced1a6101365876723d22bcfec4607537
Author: Dave Airlie <airlied at redhat.com>
Date:   Mon Jan 25 13:50:13 2010 +1000

    radeon/kms: only enable EXA pixmaps under kms if we support render accel
    
    I've seen RN50s with 64MB of RAM that are slow as molasses, this
    should fix them.
    
    RH bug 556400
    
    Signed-off-by: Dave Airlie <airlied at redhat.com>

diff --git a/src/radeon_kms.c b/src/radeon_kms.c
index c06b832..b464b66 100644
--- a/src/radeon_kms.c
+++ b/src/radeon_kms.c
@@ -473,7 +473,8 @@ Bool RADEONPreInit_KMS(ScrnInfoPtr pScrn, int flags)
 
     info->exa_pixmaps = xf86ReturnOptValBool(info->Options,
                                              OPTION_EXA_PIXMAPS, 
-					     (info->vram_size > (32 * 1024 * 1024)));
+					     ((info->vram_size > (32 * 1024 * 1024) &&
+					      info->RenderAccel)));
     if (info->exa_pixmaps)
     	xf86DrvMsg(pScrn->scrnIndex, X_INFO,
 		"EXA: Driver will allow EXA pixmaps in VRAM\n");