xf86-video-ati: Branch 'master'

[Alex Deucher]

 src/radeon_textured_video.c |    9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

New commits:
commit 4d7e1498f7d9eb50e2eddabca193fc27bde24f0e
Author: Alex Deucher <alexdeucher at gmail.com>
Date:   Tue Feb 15 11:24:23 2011 -0500

    fix Xv on pre-r6xx asics
    
    broken by:
    a9c1358099:"Xv: fix textured video alignment"
    
    Reported by:
    Artur Skawina <art.08.09 at gmail.com>
    
    Signed-off-by: Alex Deucher <alexdeucher at gmail.com>

diff --git a/src/radeon_textured_video.c b/src/radeon_textured_video.c
index 33405df..f2c8f6a 100644
--- a/src/radeon_textured_video.c
+++ b/src/radeon_textured_video.c
@@ -284,9 +284,12 @@ RADEONPutImageTextured(ScrnInfoPtr pScrn,
     }
 
 #ifdef XF86DRM_MODE
-    if (info->cs)
-	pPriv->hw_align = drmmode_get_base_align(pScrn, 2, 0);
-    else
+    if (info->cs) {
+	if (info->ChipFamily >= CHIP_FAMILY_R600)
+	    pPriv->hw_align = drmmode_get_base_align(pScrn, 2, 0);
+	else
+	    pPriv->hw_align = 64;
+    } else
 #endif
     {
 	if (info->ChipFamily >= CHIP_FAMILY_R600)