From 29e4246c5563d9790965b86b7d651d0a734ab2c8 Mon Sep 17 00:00:00 2001 From: Daniel Vetter Date: Thu, 12 May 2011 22:17:20 +0100 Subject: [PATCH] --- yaml --- r: 253204 b: refs/heads/master c: c8ebc2b076ad9e1833cb4f7f1a6f30b4786a2a09 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/gpu/drm/i915/i915_gem.c | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 92896a805330..c1c555508b59 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d3bcb75776a10ee4b67afe6156fd927b9da77d03 +refs/heads/master: c8ebc2b076ad9e1833cb4f7f1a6f30b4786a2a09 diff --git a/trunk/drivers/gpu/drm/i915/i915_gem.c b/trunk/drivers/gpu/drm/i915/i915_gem.c index 7b8feff53c0d..12d32579b951 100644 --- a/trunk/drivers/gpu/drm/i915/i915_gem.c +++ b/trunk/drivers/gpu/drm/i915/i915_gem.c @@ -1449,8 +1449,9 @@ i915_gem_get_unfenced_gtt_alignment(struct drm_i915_gem_object *obj) * edge of an even tile row (where tile rows are counted as if the bo is * placed in a fenced gtt region). */ - if (IS_GEN2(dev) || - (obj->tiling_mode == I915_TILING_Y && HAS_128_BYTE_Y_TILING(dev))) + if (IS_GEN2(dev)) + tile_height = 16; + else if (obj->tiling_mode == I915_TILING_Y && HAS_128_BYTE_Y_TILING(dev)) tile_height = 32; else tile_height = 8;