From patchwork Tue Apr 19 20:46:04 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Vetter X-Patchwork-Id: 718871 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id p3JJsVHF008095 for ; Tue, 19 Apr 2011 19:54:51 GMT Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 4CB669EF1F for ; Tue, 19 Apr 2011 12:54:31 -0700 (PDT) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mail-wy0-f177.google.com (mail-wy0-f177.google.com [74.125.82.177]) by gabe.freedesktop.org (Postfix) with ESMTP id 211C59E82E for ; Tue, 19 Apr 2011 12:52:00 -0700 (PDT) Received: by wyb28 with SMTP id 28so50925wyb.36 for ; Tue, 19 Apr 2011 12:52:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ffwll.ch; s=google; h=domainkey-signature:from:to:cc:subject:date:message-id:x-mailer :in-reply-to:references; bh=7fRZpOhIkZRXB5dRWCqvi6xS8lgnm7sise+SEIbuU7c=; b=a5NsVD6X9VrhsS8r4gOY2Er6od0CTGC40k+ZpxQK+pbmQn4ygOLk1d+9opXRBff32B JUQ2a7VeAKMh7IYkY+3/3fzQVj7vTtoLnwlmTI3xsnoKgEpD7j8godLCu8BEg4+A1f+E il/KnbmDySEsqLow768ZRlMuLOuoUsXR/smvg= DomainKey-Signature: a=rsa-sha1; c=nofws; d=ffwll.ch; s=google; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; b=Wfxpun/pf9Q9gqyC9Rg4uoJTOrJ0jhDmg5OTThc0Q/xVlksDaleMkG1jmpJ5j2m1Ac 0gXOLh/pk79cX16C02mFsXgptPWJ9773J5NrysWEVMMnuMQEBLa6MEr6T4uj0iTbCHX1 RPpqMN5AZNI48CFKJHp/nauWi/C4cwZ9E/ndM= Received: by 10.227.13.135 with SMTP id c7mr1464294wba.111.1303242719928; Tue, 19 Apr 2011 12:51:59 -0700 (PDT) Received: from localhost.localdomain (cable-static-216-94.intergga.ch [87.102.216.94]) by mx.google.com with ESMTPS id u9sm138493wbg.34.2011.04.19.12.51.58 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 19 Apr 2011 12:51:59 -0700 (PDT) From: Daniel Vetter To: intel-gfx@lists.freedesktop.org Date: Tue, 19 Apr 2011 22:46:04 +0200 Message-Id: <1303245964-3022-6-git-send-email-daniel.vetter@ffwll.ch> X-Mailer: git-send-email 1.7.4.1 In-Reply-To: <1303245964-3022-1-git-send-email-daniel.vetter@ffwll.ch> References: <1303245964-3022-1-git-send-email-daniel.vetter@ffwll.ch> Cc: Daniel Vetter Subject: [Intel-gfx] [PATCH 5/5] drm/i915: fix relaxed tiling on gen2: tile height X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.11 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: intel-gfx-bounces+patchwork-intel-gfx=patchwork.kernel.org@lists.freedesktop.org Errors-To: intel-gfx-bounces+patchwork-intel-gfx=patchwork.kernel.org@lists.freedesktop.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter1.kernel.org [140.211.167.41]); Tue, 19 Apr 2011 19:54:51 +0000 (UTC) A tile on gen2 has a size of 2kb, stride of 128 bytes and 16 rows. Userspace was broken and assumed 8 rows. Chris Wilson noted that the kernel unfortunately can't reliable check that because libdrm rounds up the size to the next bucket. Signed-off-by: Daniel Vetter --- drivers/gpu/drm/i915/i915_gem.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c index 6471d51..262fa45 100644 --- a/drivers/gpu/drm/i915/i915_gem.c +++ b/drivers/gpu/drm/i915/i915_gem.c @@ -1504,8 +1504,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;