xf86-video-ati: Branch 'master'

[Dave Airlie]

 src/radeon_exa_funcs.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 153ad6fcf704cbf9f811d9986cd4baf04e82c9d2
Author: Dave Airlie <airlied at linux.ie>
Date:   Mon Feb 25 07:10:48 2008 +1000

    fixup check for EXA composite pointed out by Alan Swanson

diff --git a/src/radeon_exa_funcs.c b/src/radeon_exa_funcs.c
index 6e22bb5..10221c0 100644
--- a/src/radeon_exa_funcs.c
+++ b/src/radeon_exa_funcs.c
@@ -537,7 +537,7 @@ Bool FUNC_NAME(RADEONDrawInit)(ScreenPtr pScreen)
 	    (info->ChipFamily == CHIP_FAMILY_RS400))
 		xf86DrvMsg(pScrn->scrnIndex, X_INFO, "Render acceleration "
 			       "unsupported on XPRESS, R500 and newer cards.\n");
-	else if (IS_R300_VARIANT || info->ChipFamily <= CHIP_FAMILY_RS690) {
+	else if (IS_R300_VARIANT || (IS_AVIVO_VARIANT && info->ChipFamily <= CHIP_FAMILY_RS690)) {
 		xf86DrvMsg(pScrn->scrnIndex, X_INFO, "Render acceleration "
 			       "enabled for R300 type cards.\n");
 		info->exa->CheckComposite = R300CheckComposite;