xf86-video-ati: Branch 'master'

[Alex Deucher]

 src/radeon_dri2.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 122bedcbcf45cb583cf51b2fd04ed2805e0ca60b
Author: Alex Deucher <alexdeucher at gmail.com>
Date:   Thu Jun 16 12:57:11 2011 -0400

    dri2: missing bit from a6154c00c64932332e8f6e334661ffd579cfd894
    
    Signed-off-by: Alex Deucher <alexdeucher at gmail.com>

diff --git a/src/radeon_dri2.c b/src/radeon_dri2.c
index 9bb5f39..512c447 100644
--- a/src/radeon_dri2.c
+++ b/src/radeon_dri2.c
@@ -179,7 +179,7 @@ radeon_dri2_create_buffers(DrawablePtr drawable,
 		aligned_height = RADEON_ALIGN(size / pitch_bytes, height_align);
 
 		pixmap = (*pScreen->CreatePixmap)(pScreen,
-						  drawable->width,
+						  aligned_width,
 						  aligned_height,
 						  drawable->depth,
 						  flags);
@@ -332,7 +332,7 @@ radeon_dri2_create_buffer(DrawablePtr drawable,
 	    aligned_height = RADEON_ALIGN(size / pitch_bytes, height_align);
 
 	    pixmap = (*pScreen->CreatePixmap)(pScreen,
-					      drawable->width,
+					      aligned_width,
 					      aligned_height,
 					      (format != 0)?format:drawable->depth,
 					      flags);