xf86-video-ati: Branch 'master'

[Alex Deucher]

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

New commits:
commit de40d36264364434541377c7f65f3836dc514fc0
Author: Kusanagi Kouichi <slash at ac.auone-net.jp>
Date:   Fri Jan 22 17:18:51 2010 +0900

    Remove unnecessary checks.
    
    Signed-off-by: Kusanagi Kouichi <slash at ac.auone-net.jp>

diff --git a/src/radeon_textured_video.c b/src/radeon_textured_video.c
index 2e5d763..fdc077e 100644
--- a/src/radeon_textured_video.c
+++ b/src/radeon_textured_video.c
@@ -316,21 +316,16 @@ RADEONPutImageTextured(ScrnInfoPtr pScrn,
     }
 
     if (pPriv->video_memory == NULL) {
-	if (info->ChipFamily >= CHIP_FAMILY_R600)
-	    pPriv->video_offset = radeon_legacy_allocate_memory(pScrn,
-								&pPriv->video_memory,
-								size, 256);
-	else
-	    pPriv->video_offset = radeon_legacy_allocate_memory(pScrn,
-								&pPriv->video_memory,
-								size, 64);
+	pPriv->video_offset = radeon_legacy_allocate_memory(pScrn,
+							    &pPriv->video_memory,
+							    size, hw_align + 1);
 	if (pPriv->video_offset == 0)
 	    return BadAlloc;
 
 	if (info->cs) {
 	    pPriv->src_bo[0] = pPriv->video_memory;
 	    radeon_legacy_allocate_memory(pScrn, (void*)&pPriv->src_bo[1], size,
-					  info->ChipFamily >= CHIP_FAMILY_R600 ? 256 : 64);
+					  hw_align + 1);
 	}
     }