xf86-video-ati: Branch 'master'

[Alex Deucher]

 src/radeon_kms.c |   14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

New commits:
commit 9bb31158466e6168116d841d12c8b4303f11c4a6
Author: Alex Deucher <alexdeucher at gmail.com>
Date:   Wed Jun 22 12:24:28 2011 -0400

    evergreen: fix num_banks for 2D tiling config
    
    The field is encoded.
    
    Signed-off-by: Alex Deucher <alexdeucher at gmail.com>

diff --git a/src/radeon_kms.c b/src/radeon_kms.c
index aa4b1e3..e163e99 100644
--- a/src/radeon_kms.c
+++ b/src/radeon_kms.c
@@ -522,7 +522,19 @@ static Bool r600_get_tile_config(ScrnInfoPtr pScrn)
                 return FALSE;
 	    }
 
-	    info->num_banks = (info->tile_config & 0xf0) >> 4;
+	    switch((info->tile_config & 0xf0) >> 4) {
+	    case 0:
+		info->num_banks = 4;
+		break;
+	    case 1:
+		info->num_banks = 8;
+		break;
+	    case 2:
+		info->num_banks = 16;
+		break;
+	    default:
+		return FALSE;
+	    }
 
 	    switch ((info->tile_config & 0xf00) >> 8) {
 	    case 0: