From patchwork Sat Mar 26 14:22:57 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Vetter X-Patchwork-Id: 665691 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 p2QEPqtO026636 for ; Sat, 26 Mar 2011 14:26:14 GMT Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 61F2E9E95B for ; Sat, 26 Mar 2011 07:25:52 -0700 (PDT) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@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]); Sat, 26 Mar 2011 14:26:14 +0000 (UTC) X-Greylist: delayed 426 seconds by postgrey-1.31 at gabe; Sat, 26 Mar 2011 07:25:31 PDT Received: from mail.ffwll.ch (cable-static-216-94.intergga.ch [87.102.216.94]) by gabe.freedesktop.org (Postfix) with ESMTP id A5F159E78C for ; Sat, 26 Mar 2011 07:25:31 -0700 (PDT) Received: by mail.ffwll.ch (Postfix, from userid 1000) id F2C95240573; Sat, 26 Mar 2011 15:18:23 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on orange.ffwll.ch X-Spam-Level: X-Spam-Status: No, score=-2.9 required=6.0 tests=ALL_TRUSTED,BAYES_00 autolearn=unavailable version=3.3.1 X-Spam-ASN: X-Spam-Spammy: 0.965-+--H*r:mail.ffwll.ch, 0.960-+--H*m:ffwll X-Spam-Hammy: 0.000-+--HCc:D*freedesktop.org, 0.000-+--HCc:D*lists.freedesktop.org, 0.000-+--H*UA:git-send-email Received: from biene (unknown [192.168.23.129]) by mail.ffwll.ch (Postfix) with ESMTP id 736A7240098; Sat, 26 Mar 2011 15:18:11 +0100 (CET) Received: from daniel by biene with local (Exim 4.74) (envelope-from ) id 1Q3UOK-0001sa-46; Sat, 26 Mar 2011 15:23:00 +0100 From: Daniel Vetter To: Chris Wilson Date: Sat, 26 Mar 2011 15:22:57 +0100 Message-Id: <1301149377-7195-1-git-send-email-daniel.vetter@ffwll.ch> X-Mailer: git-send-email 1.7.4.1 In-Reply-To: <849307$c62598@azsmga001.ch.intel.com> References: <849307$c62598@azsmga001.ch.intel.com> Cc: Daniel Vetter , intel-gfx@lists.freedesktop.org Subject: [Intel-gfx] [PATCH] drm/i915: fix relaxed tiling on gen2 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 diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c index 4554b2f..bc96e70 100644 --- a/drivers/gpu/drm/i915/i915_gem.c +++ b/drivers/gpu/drm/i915/i915_gem.c @@ -1452,8 +1452,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; diff --git a/drivers/gpu/drm/i915/i915_gem_tiling.c b/drivers/gpu/drm/i915/i915_gem_tiling.c index 281ad3d..693e6e8 100644 --- a/drivers/gpu/drm/i915/i915_gem_tiling.c +++ b/drivers/gpu/drm/i915/i915_gem_tiling.c @@ -190,6 +190,9 @@ i915_tiling_ok(struct drm_device *dev, int stride, int size, int tiling_mode) if (tiling_mode == I915_TILING_NONE) return true; + if (IS_GEN2(dev) && tiling_mode == I915_TILING_Y) + return false; + if (IS_GEN2(dev) || (tiling_mode == I915_TILING_Y && HAS_128_BYTE_Y_TILING(dev))) tile_width = 128; @@ -226,6 +229,12 @@ i915_tiling_ok(struct drm_device *dev, int stride, int size, int tiling_mode) if (stride < tile_width) return false; + if (IS_GEN2(dev) && (size / tile_width) % 16 != 0) { + printk_once("broken userspace detected, " + "please upgrade libdrm and xf86-video-intel\n"); + return false; + } + if (stride & (stride - 1)) return false;