xf86-video-intel: src/sna/kgem.c
Chris Wilson
ickle at kemper.freedesktop.org
Wed Apr 18 04:10:15 PDT 2012
src/sna/kgem.c | 13 ++++---------
1 file changed, 4 insertions(+), 9 deletions(-)
New commits:
commit fd81408b978c9b57c046ee43d2d32e1370e83a7d
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date: Wed Apr 18 11:39:43 2012 +0100
sna: Increase the render target alignment to 4 pixels on gen4+ as well
Repoerted-and-tested-by: Toralf Förster <toralf.foerster at gmx.de
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=48865
Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>
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);
More information about the xorg-commit
mailing list