xf86-video-ati: Branch 'master'

[Alex Deucher]

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

New commits:
commit 3b38701a72fa1cad1e4610a2f4330b3da4cc6391
Author: Vadim Girlin <vadimgirlin at gmail.com>
Date:   Fri Nov 1 10:36:39 2013 -0400

    radeon: disable 2D tiling on buffers < 128 pixels
    
    Seems to run into alignment problems with certain
    card configurations.
    
    bug:
    https://bugs.freedesktop.org/show_bug.cgi?id=70675
    
    Signed-off-by: Alex Deucher <alexander.deucher at amd.com>

diff --git a/src/radeon_bo_helper.c b/src/radeon_bo_helper.c
index 539590c..ed964d7 100644
--- a/src/radeon_bo_helper.c
+++ b/src/radeon_bo_helper.c
@@ -124,7 +124,7 @@ radeon_alloc_pixmap_bo(ScrnInfoPtr pScrn, int width, int height, int depth,
 			surface.last_level = 0;
 			surface.bpe = cpp;
 			surface.nsamples = 1;
-			if (height < 64) {
+			if (height < 128) {
 				/* disable 2d tiling for small surface to work around
 				 * the fact that ddx align height to 8 pixel for old
 				 * obscure reason i can't remember