From 0485f27bc3d75cb6ab320e8164dbe6ea2713c78e Mon Sep 17 00:00:00 2001 From: Alex Deucher Date: Tue, 14 Jul 2009 13:11:12 -0400 Subject: R3/4/5xx: fix bicubic Xv filtering with KMS changes fixes bug 22730 --- src/radeon_textured_video.c | 4 ++-- src/radeon_textured_videofuncs.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'src') diff --git a/src/radeon_textured_video.c b/src/radeon_textured_video.c index 10414b91..617f359f 100644 --- a/src/radeon_textured_video.c +++ b/src/radeon_textured_video.c @@ -336,7 +336,7 @@ RADEONPutImageTextured(ScrnInfoPtr pScrn, pPriv->bicubic_offset = radeon_legacy_allocate_memory(pScrn, &pPriv->bicubic_memory, sizeof(bicubic_tex_512), 64); - pPriv->bicubic_src_offset = pPriv->bicubic_offset + info->fbLocation + pScrn->fbOffset; + pPriv->bicubic_src_offset = pPriv->bicubic_offset; if (pPriv->bicubic_offset == 0) pPriv->bicubic_enabled = FALSE; @@ -458,7 +458,7 @@ RADEONPutImageTextured(ScrnInfoPtr pScrn, ret = radeon_bo_map(pPriv->bicubic_bo, 1); if (ret) return BadAlloc; - + bicubic_addr = pPriv->bicubic_bo->ptr; } else bicubic_addr = (uint8_t *)(info->FB + pPriv->bicubic_offset); diff --git a/src/radeon_textured_videofuncs.c b/src/radeon_textured_videofuncs.c index 6e8b3f97..280a7990 100644 --- a/src/radeon_textured_videofuncs.c +++ b/src/radeon_textured_videofuncs.c @@ -1220,7 +1220,7 @@ FUNC_NAME(R300DisplayTexturedVideo)(ScrnInfoPtr pScrn, RADEONPortPrivPtr pPriv) bicubic_offset = 0; else bicubic_offset = pPriv->bicubic_src_offset; - + BEGIN_ACCEL_RELOC(6, 1); OUT_ACCEL_REG(R300_TX_FILTER0_1, txfilter); OUT_ACCEL_REG(R300_TX_FILTER1_1, 0); -- cgit v1.2.3