xf86-video-ati: Branch 'master'

[Alex Deucher]

 src/drmmode_display.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 355f0f7a67ce239b7fd2f2e81bcaaa88b2a09f03
Author: Alex Deucher <alexdeucher at gmail.com>
Date:   Sat Feb 12 04:52:52 2011 -0500

    kms: fix rotate pitch align
    
    Signed-off-by: Alex Deucher <alexdeucher at gmail.com>

diff --git a/src/drmmode_display.c b/src/drmmode_display.c
index 705a41a..82d6a33 100644
--- a/src/drmmode_display.c
+++ b/src/drmmode_display.c
@@ -489,7 +489,7 @@ drmmode_crtc_shadow_create(xf86CrtcPtr crtc, void *data, int width, int height)
 	if (!data)
 		data = drmmode_crtc_shadow_allocate (crtc, width, height);
 
-	rotate_pitch = RADEON_ALIGN(width, 64) * drmmode->cpp;
+	rotate_pitch = RADEON_ALIGN(width, drmmode_get_pitch_align(pScrn, drmmode->cpp, 0)) * drmmode->cpp;
 
 	rotate_pixmap = drmmode_create_bo_pixmap(pScrn->pScreen,
 						 width, height,