xf86-video-ati: Branch 'master'

[Alex Deucher]

 src/radeon_video.c |   14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

New commits:
commit edfb3b6bbf0ee17ace8e6ba704a6f54e249fec63
Author: Alex Deucher <alex at samba.(none)>
Date:   Sat Feb 23 19:59:33 2008 -0500

    RADEON: no textured video yet on XPRESS chips
    
    Still need to sort out the VAP and PVS stuff

diff --git a/src/radeon_video.c b/src/radeon_video.c
index ba7cf74..487f064 100644
--- a/src/radeon_video.c
+++ b/src/radeon_video.c
@@ -285,12 +285,14 @@ void RADEONInitVideo(ScreenPtr pScreen)
 	RADEONInitOffscreenImages(pScreen);
     }
 
-    texturedAdaptor = RADEONSetupImageTexturedVideo(pScreen);
-    if (texturedAdaptor != NULL) {
-	adaptors[num_adaptors++] = texturedAdaptor;
-	xf86DrvMsg(pScrn->scrnIndex, X_INFO, "Set up textured video\n");
-    } else
-	xf86DrvMsg(pScrn->scrnIndex, X_ERROR, "Failed to set up textured video\n");
+    if (info->ChipFamily != CHIP_FAMILY_RS400) {
+	texturedAdaptor = RADEONSetupImageTexturedVideo(pScreen);
+	if (texturedAdaptor != NULL) {
+	    adaptors[num_adaptors++] = texturedAdaptor;
+	    xf86DrvMsg(pScrn->scrnIndex, X_INFO, "Set up textured video\n");
+	} else
+	    xf86DrvMsg(pScrn->scrnIndex, X_ERROR, "Failed to set up textured video\n");
+    }
 
     if(num_adaptors)
 	xf86XVScreenInit(pScreen, adaptors, num_adaptors);