summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlex Deucher <alex@samba.(none)>2008-03-19 12:01:50 -0400
committerAlex Deucher <alex@samba.(none)>2008-03-19 12:01:50 -0400
commitf5951db7b3522e0fe6af7f46a170c9c9a60a9bff (patch)
treed716f716190b99a912d27f73482467ac228d5806
parent13573879fe56368ad06234712b677c23fabc56c6 (diff)
RV515: fix textured video and EXA Composite
There seems to be an issue with the PVS setup on RV515, but bypassing it seems to work fine.
-rw-r--r--src/radeon_exa_render.c3
-rw-r--r--src/radeon_textured_videofuncs.c3
2 files changed, 4 insertions, 2 deletions
diff --git a/src/radeon_exa_render.c b/src/radeon_exa_render.c
index 66652ce5..c3ad7a5e 100644
--- a/src/radeon_exa_render.c
+++ b/src/radeon_exa_render.c
@@ -1042,7 +1042,8 @@ static Bool FUNC_NAME(R300PrepareComposite)(int op, PicturePtr pSrcPicture,
int pixel_shift;
int has_tcl = ((info->ChipFamily != CHIP_FAMILY_RS690) &&
(info->ChipFamily != CHIP_FAMILY_RS740) &&
- (info->ChipFamily != CHIP_FAMILY_RS400));
+ (info->ChipFamily != CHIP_FAMILY_RS400) &&
+ (info->ChipFamily != CHIP_FAMILY_RV515));
ACCEL_PREAMBLE();
TRACE;
diff --git a/src/radeon_textured_videofuncs.c b/src/radeon_textured_videofuncs.c
index 2d5819a4..647fa808 100644
--- a/src/radeon_textured_videofuncs.c
+++ b/src/radeon_textured_videofuncs.c
@@ -130,7 +130,8 @@ FUNC_NAME(RADEONDisplayTexturedVideo)(ScrnInfoPtr pScrn, RADEONPortPrivPtr pPriv
if (IS_R300_VARIANT || IS_AVIVO_VARIANT) {
int has_tcl = ((info->ChipFamily != CHIP_FAMILY_RS690) &&
(info->ChipFamily != CHIP_FAMILY_RS740) &&
- (info->ChipFamily != CHIP_FAMILY_RS400));
+ (info->ChipFamily != CHIP_FAMILY_RS400) &&
+ (info->ChipFamily != CHIP_FAMILY_RV515));
switch (pPixmap->drawable.bitsPerPixel) {
case 16: