summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlex Deucher <alex@samba.(none)>2008-02-23 19:59:33 -0500
committerAlex Deucher <alex@samba.(none)>2008-02-23 19:59:33 -0500
commitedfb3b6bbf0ee17ace8e6ba704a6f54e249fec63 (patch)
treeffcfc5d1e75bd14717979445e206796fe225f54f
parent4146bfe5d00e40a86d17826fac50d04b2469621d (diff)
RADEON: no textured video yet on XPRESS chips
Still need to sort out the VAP and PVS stuff
-rw-r--r--src/radeon_video.c14
1 files changed, 8 insertions, 6 deletions
diff --git a/src/radeon_video.c b/src/radeon_video.c
index ba7cf74c..487f064b 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);