xf86-video-ati: Branch 'master'

[Alex Deucher]

 src/radeon_kms.c |    1 +
 1 file changed, 1 insertion(+)

New commits:
commit f64bf0de8e2de7c1bf9cc0c614603dd23c9060ad
Author: Alex Deucher <alexdeucher at gmail.com>
Date:   Thu Jun 3 14:48:21 2010 -0400

    evergreen: explicitly disable accel on evergreen
    
    Previously we relied on the drm not having accel enabled
    to make sure evergreen used shadowfb, now we when we enable
    accel in the drm, we need to make sure the ddx doesn't try
    and use it until it's implemented.
    
    Signed-off-by: Alex Deucher <alexdeucher at gmail.com>

diff --git a/src/radeon_kms.c b/src/radeon_kms.c
index e4c1c0b..c6a3df7 100644
--- a/src/radeon_kms.c
+++ b/src/radeon_kms.c
@@ -228,6 +228,7 @@ static Bool RADEONPreInitAccel_KMS(ScrnInfoPtr pScrn)
     }
 
     if (xf86ReturnOptValBool(info->Options, OPTION_NOACCEL, FALSE) ||
+	(info->ChipFamily >= CHIP_FAMILY_CEDAR) ||
 	(!RADEONIsAccelWorking(pScrn))) {
 	xf86DrvMsg(pScrn->scrnIndex, X_INFO,
 		   "GPU accel disabled or not working, using shadowfb for KMS\n");