summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorAlex Deucher <alexdeucher@gmail.com>2011-02-15 11:24:23 -0500
committerAlex Deucher <alexdeucher@gmail.com>2011-02-15 11:24:23 -0500
commit4d7e1498f7d9eb50e2eddabca193fc27bde24f0e (patch)
tree374979fca3519516fe7a3e77d248b105b691b448 /src
parenta9a59717d11af37a2dda5555f6a83c5b65449527 (diff)
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>
Diffstat (limited to 'src')
-rw-r--r--src/radeon_textured_video.c9
1 files changed, 6 insertions, 3 deletions
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)