xf86-video-intel: src/sna/kgem.c

[Chris Wilson]

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

New commits:
commit 2934e778f01cdf1307732b248b11a31c0e79e866
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Mon Dec 26 11:30:39 2011 +0000

    sna: Increase the minimum alignment constraint for g33
    
    Still not getting the single-stream mode that I am aiming for!
    
    Reported-by: Matti Hamalainen <ccr at tnsp.org>
    Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=44150
    Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>

diff --git a/src/sna/kgem.c b/src/sna/kgem.c
index ee2b969..45aa5f8 100644
--- a/src/sna/kgem.c
+++ b/src/sna/kgem.c
@@ -559,7 +559,7 @@ static uint32_t kgem_untiled_pitch(struct kgem *kgem,
 	/* XXX workaround an issue on gen3 where we appear to fail to
 	 * disable dual-stream mode */
 	return ALIGN(width * bpp,
-		     scanout || (kgem->gen >= 30 && kgem->gen < 33) ? 8*64 : 8*4) >> 3;
+		     scanout || kgem->gen < 40 ? 8*64 : 8*4) >> 3;
 }
 
 static uint32_t kgem_surface_size(struct kgem *kgem,
@@ -585,7 +585,7 @@ static uint32_t kgem_surface_size(struct kgem *kgem,
 	} else switch (tiling) {
 	default:
 	case I915_TILING_NONE:
-		tile_width = scanout || kgem->gen < 33 ? 64 : 4;
+		tile_width = scanout || kgem->gen < 40 ? 64 : 4;
 		tile_height = 2;
 		break;
 	case I915_TILING_X: