xf86-video-ati: Branch 'master'

[Alex Deucher]

 src/radeon_textured_video.c      |    4 ++--
 src/radeon_textured_videofuncs.c |    2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 0485f27bc3d75cb6ab320e8164dbe6ea2713c78e
Author: Alex Deucher <alexdeucher at gmail.com>
Date:   Tue Jul 14 13:11:12 2009 -0400

    R3/4/5xx: fix bicubic Xv filtering with KMS changes
    
    fixes bug 22730

diff --git a/src/radeon_textured_video.c b/src/radeon_textured_video.c
index 10414b9..617f359 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 6e8b3f9..280a799 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);