From c090df8f01b93f4bc06026f5fd38d04237520673 Mon Sep 17 00:00:00 2001 From: Chris Wilson Date: Wed, 18 Apr 2012 11:39:43 +0100 Subject: [PATCH] bug48865 --- src/sna/kgem.c | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/src/sna/kgem.c b/src/sna/kgem.c index 3d722d0..72b6ad7 100644 --- a/src/sna/kgem.c +++ b/src/sna/kgem.c @@ -838,13 +838,8 @@ static uint32_t kgem_surface_size(struct kgem *kgem, } else switch (tiling) { default: case I915_TILING_NONE: - if (kgem->gen < 40) { - tile_width = scanout ? 64 : 4 * bpp >> 3; - tile_height = 4; - } else { - tile_width = scanout ? 64 : 2 * bpp >> 3; - tile_height = 2; - } + tile_width = scanout ? 64 : 4 * bpp >> 3; + tile_height = 2; break; case I915_TILING_X: tile_width = 512; @@ -898,7 +893,7 @@ static uint32_t kgem_aligned_height(struct kgem *kgem, } else switch (tiling) { default: case I915_TILING_NONE: - tile_height = kgem->gen < 40 ? 4 : 2; + tile_height = 2; break; case I915_TILING_X: tile_height = 8; @@ -2881,7 +2876,7 @@ struct kgem_bo *kgem_create_cpu_2d(struct kgem *kgem, stride = ALIGN(width, 2) * bpp >> 3; stride = ALIGN(stride, 4); - size = ALIGN(height, kgem->gen < 40 ? 4 : 2) * stride; + size = ALIGN(height, 2) * stride; assert(size >= PAGE_SIZE); -- 1.7.10