xf86-video-ati: Branch 'master'

[Alex Deucher]

 src/radeon_textured_videofuncs.c |    7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

New commits:
commit 7ae4cec8cc8c90aee5dc4fa7abcce22321d4f4eb
Author: Roland Scheidegger <sroland at tungstengraphics.com>
Date:   Mon Jul 7 14:39:47 2008 -0400

    clamp tex coords (r100/r200) for textured video
    
    fixes bug 14904

diff --git a/src/radeon_textured_videofuncs.c b/src/radeon_textured_videofuncs.c
index 277d9b2..98dc9a4 100644
--- a/src/radeon_textured_videofuncs.c
+++ b/src/radeon_textured_videofuncs.c
@@ -486,6 +486,8 @@ FUNC_NAME(RADEONDisplayTexturedVideo)(ScrnInfoPtr pScrn, RADEONPortPrivPtr pPriv
 	    OUT_VIDEO_REG(R200_PP_TXFILTER_0,
 			R200_MAG_FILTER_LINEAR |
 			R200_MIN_FILTER_LINEAR |
+			R200_CLAMP_S_CLAMP_LAST |
+			R200_CLAMP_T_CLAMP_LAST |
 			R200_YUV_TO_RGB);
 	    OUT_VIDEO_REG(R200_PP_TXFORMAT_0, txformat);
 	    OUT_VIDEO_REG(R200_PP_TXFORMAT_X_0, 0);
@@ -521,8 +523,11 @@ FUNC_NAME(RADEONDisplayTexturedVideo)(ScrnInfoPtr pScrn, RADEONPortPrivPtr pPriv
 	    OUT_VIDEO_REG(RADEON_SE_VTX_FMT, RADEON_SE_VTX_FMT_XY |
 			RADEON_SE_VTX_FMT_ST0);
 
-	    OUT_VIDEO_REG(RADEON_PP_TXFILTER_0, RADEON_MAG_FILTER_LINEAR |
+	    OUT_VIDEO_REG(RADEON_PP_TXFILTER_0,
+			RADEON_MAG_FILTER_LINEAR |
 			RADEON_MIN_FILTER_LINEAR |
+			RADEON_CLAMP_S_CLAMP_LAST |
+			RADEON_CLAMP_T_CLAMP_LAST |
 			RADEON_YUV_TO_RGB);
 	    OUT_VIDEO_REG(RADEON_PP_TXFORMAT_0, txformat);
 	    OUT_VIDEO_REG(RADEON_PP_TXOFFSET_0, pPriv->src_offset);