xf86-video-ati: Branch 'master'

[Alex Deucher]

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

New commits:
commit dbb2ca471dfbff245b30c5055871dee0dc0e3d15
Author: Alex Deucher <alex at samba.(none)>
Date:   Wed Jan 16 17:10:02 2008 -0500

    R300: only enable render accel on non-IGP r3xx/r4xx chips for now

diff --git a/src/radeon_exa_funcs.c b/src/radeon_exa_funcs.c
index b27a266..f62a020 100644
--- a/src/radeon_exa_funcs.c
+++ b/src/radeon_exa_funcs.c
@@ -533,7 +533,7 @@ Bool FUNC_NAME(RADEONDrawInit)(ScreenPtr pScreen)
 
 #ifdef RENDER
     if (info->RenderAccel) {
-	if (info->ChipFamily >= CHIP_FAMILY_R300) {
+	if (IS_R300_VARIANT && !info->IsIGP) {
 		xf86DrvMsg(pScrn->scrnIndex, X_INFO, "Render acceleration "
 			       "enabled for R300 type cards.\n");
 		info->exa->CheckComposite = R300CheckComposite;