xf86-video-ati: Branch 'master'

[Dave Airlie]

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

New commits:
commit 179b0e15924ae2757efaece6488ae835ba6436e3
Author: Dave Airlie <airlied at redhat.com>
Date:   Tue Oct 19 13:37:22 2010 +1000

    r600: for 2d tiles we need to align to channels no banks.

diff --git a/src/radeon_exa.c b/src/radeon_exa.c
index c0f9dc9..d9301d8 100644
--- a/src/radeon_exa.c
+++ b/src/radeon_exa.c
@@ -465,7 +465,7 @@ void *RADEONEXACreatePixmap2(ScreenPtr pScreen, int width, int height,
 	int bpe = bitsPerPixel / 8;
 
 	if (tiling & RADEON_TILING_MACRO) {
-	    height = RADEON_ALIGN(height, info->num_banks * 8);
+	    height = RADEON_ALIGN(height, info->num_channels * 8);
 	    pixmap_align = MAX(info->num_banks,
 			       (((info->group_bytes / 8) / bpe) * info->num_banks)) * 8 * bpe;
 	} else if (tiling & RADEON_TILING_MICRO) {