From 4d7e1498f7d9eb50e2eddabca193fc27bde24f0e Mon Sep 17 00:00:00 2001
From: Alex Deucher <alexdeucher@gmail.com>
Date: Tue, 15 Feb 2011 11:24:23 -0500
Subject: fix Xv on pre-r6xx asics

broken by:
a9c1358099:"Xv: fix textured video alignment"

Reported by:
Artur Skawina <art.08.09@gmail.com>

Signed-off-by: Alex Deucher <alexdeucher@gmail.com>
---
 src/radeon_textured_video.c | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

(limited to 'src/radeon_textured_video.c')

diff --git a/src/radeon_textured_video.c b/src/radeon_textured_video.c
index 33405df5..f2c8f6aa 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)
-- 
cgit v1.2.3