From e6018c25ca63fa6066d8fa6e57373030d07b0392 Mon Sep 17 00:00:00 2001 From: Daniel Vetter Date: Tue, 22 Feb 2011 19:11:07 +0100 Subject: intel: Fixup for the fix for relaxed tiling on gen2 This is Fail. First patch to libdrm, and I've borked it up. Noticed-by: Chris Wilson Signed-off-by: Daniel Vetter --- intel/intel_bufmgr_gem.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/intel/intel_bufmgr_gem.c b/intel/intel_bufmgr_gem.c index 9b324d959..f5ab0a6f3 100644 --- a/intel/intel_bufmgr_gem.c +++ b/intel/intel_bufmgr_gem.c @@ -767,7 +767,7 @@ drm_intel_gem_bo_alloc_tiled(drm_intel_bufmgr *bufmgr, const char *name, else if (tiling == I915_TILING_Y) height_alignment = 32; /* i8xx has a interleaved 2-row tile layout */ - if (IS_GEN2(bufmgr_gem)) + if (IS_GEN2(bufmgr_gem) && tiling != I915_TILING_NONE) height_alignment *= 2; aligned_y = ALIGN(y, height_alignment); -- cgit v1.2.3