xf86-video-ati: Branch 'master'

[Michel Dänzer]

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

New commits:
commit fc07c370dac4649511eb7322d05a61605a539f39
Author: Mario Kleiner <mario.kleiner.de at gmail.com>
Date:   Sun Jun 28 02:45:58 2015 +0200

    Fix inconsistent default eg_tile_split in evergreen_accel.c
    
    eg_tile_split() maps the default: switch-case to tile split
    flag 6, like for a tile split size of 4096 Bytes. All other
    instances of tile split mappings or reverse mappings in both
    the ddx and in Mesa's radeon gallium drivers assign the default:
    case to tile split flag 4, consistent with a default of 1024
    Bytes.
    
    Make this one outlier consistent with other instances of
    mappings in the code to avoid surprises.
    
    Signed-off-by: Mario Kleiner <mario.kleiner.de at gmail.com>

diff --git a/src/evergreen_accel.c b/src/evergreen_accel.c
index 41ebc1a..43146bb 100644
--- a/src/evergreen_accel.c
+++ b/src/evergreen_accel.c
@@ -79,9 +79,9 @@ unsigned eg_tile_split(unsigned tile_split)
 	case 128:	tile_split = 1;	break;
 	case 256:	tile_split = 2;	break;
 	case 512:	tile_split = 3;	break;
+	default:
 	case 1024:	tile_split = 4;	break;
 	case 2048:	tile_split = 5;	break;
-	default:
 	case 4096:	tile_split = 6;	break;
 	}
 	return tile_split;