xf86-video-ati: Branch 'master'

[Alex Deucher]

 src/radeon_exa_funcs.c |    7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

New commits:
commit 24c7d134cd450f9e2cca85e4a2fc3253d250be04
Author: Alex Deucher <alex at botch2.(none)>
Date:   Fri Jan 18 09:50:38 2008 -0500

    RADEON: make sure EXA Composite is actually disabled on XPRESS chips.

diff --git a/src/radeon_exa_funcs.c b/src/radeon_exa_funcs.c
index d0c0065..20b96a5 100644
--- a/src/radeon_exa_funcs.c
+++ b/src/radeon_exa_funcs.c
@@ -533,10 +533,11 @@ Bool FUNC_NAME(RADEONDrawInit)(ScreenPtr pScreen)
 
 #ifdef RENDER
     if (info->RenderAccel) {
-	if (info->ChipFamily >= CHIP_FAMILY_RV515)
+	if ((info->ChipFamily >= CHIP_FAMILY_RV515) ||
+	    (info->ChipFamily == CHIP_FAMILY_RS400))
 		xf86DrvMsg(pScrn->scrnIndex, X_INFO, "Render acceleration "
-			       "unsupported on R500 and newer cards.\n");
-	else if (IS_R300_VARIANT && !info->IsIGP) {
+			       "unsupported on XPRESS, R500 and newer cards.\n");
+	else if (IS_R300_VARIANT) {
 		xf86DrvMsg(pScrn->scrnIndex, X_INFO, "Render acceleration "
 			       "enabled for R300 type cards.\n");
 		info->exa->CheckComposite = R300CheckComposite;