xf86-video-ati: Branch 'r3xx-render' - 2 commits

[Alex Deucher]

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

New commits:
commit 85d0c9e8d22ccc72bec87b3fd44da5d7609293e0
Author: Alex Deucher <alex at samba.(none)>
Date:   Wed Mar 19 12:07:33 2008 -0400

    RADEON: fixed textured video with XAA and tiling

diff --git a/src/radeon_textured_video.c b/src/radeon_textured_video.c
index 6072c0e..05dd20e 100644
--- a/src/radeon_textured_video.c
+++ b/src/radeon_textured_video.c
@@ -60,6 +60,9 @@ RADEONTilingEnabled(ScrnInfoPtr pScrn, PixmapPtr pPix)
     } else
 #endif
 	{
+	    if (info->tilingEnabled && ((pPix->devPrivate.ptr - info->FB) == 0))
+		return TRUE;
+	    else
 		return FALSE;
 	}
 }
commit f5951db7b3522e0fe6af7f46a170c9c9a60a9bff
Author: Alex Deucher <alex at samba.(none)>
Date:   Wed Mar 19 12:01:50 2008 -0400

    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.

diff --git a/src/radeon_exa_render.c b/src/radeon_exa_render.c
index 66652ce..c3ad7a5 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 2d5819a..647fa80 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: