From patchwork Sat Mar 26 19:55:15 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Vetter X-Patchwork-Id: 666091 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 p2QJp5jk017313 for ; Sat, 26 Mar 2011 19:51:26 GMT Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id F03029E8D1 for ; Sat, 26 Mar 2011 12:51:04 -0700 (PDT) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mail.ffwll.ch (cable-static-216-94.intergga.ch [87.102.216.94]) by gabe.freedesktop.org (Postfix) with ESMTP id 03FF29E7AE for ; Sat, 26 Mar 2011 12:50:45 -0700 (PDT) Received: by mail.ffwll.ch (Postfix, from userid 1000) id 85C3C2404FA; Sat, 26 Mar 2011 20:50:44 +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, 0.941-+--H*Ad:D*ffwll.ch 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 9265E24027D; Sat, 26 Mar 2011 20:50:29 +0100 (CET) Received: from daniel by biene with local (Exim 4.74) (envelope-from ) id 1Q3ZZu-0003G6-H3; Sat, 26 Mar 2011 20:55:18 +0100 From: Daniel Vetter To: Chris Wilson Date: Sat, 26 Mar 2011 20:55:15 +0100 Message-Id: <1301169315-12498-1-git-send-email-daniel.vetter@ffwll.ch> X-Mailer: git-send-email 1.7.4.1 In-Reply-To: <1bdc18$k0pvil@fmsmga002.fm.intel.com> References: <1bdc18$k0pvil@fmsmga002.fm.intel.com> Cc: Daniel Vetter , intel-gfx@lists.freedesktop.org Subject: [Intel-gfx] [PATCH] drm/i915: fix relaxed tiling on gen2 v2 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]); Sat, 26 Mar 2011 19:51:26 +0000 (UTC) diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c index 4554b2f..1483107 100644 --- a/drivers/gpu/drm/i915/i915_gem.c +++ b/drivers/gpu/drm/i915/i915_gem.c @@ -1210,6 +1210,11 @@ int i915_gem_fault(struct vm_area_struct *vma, struct vm_fault *vmf) trace_i915_gem_object_fault(obj, page_offset, true, write); + /* i855gm has broken y-tiled fences for cpu access, blitter should work, + * though. */ + if (IS_I85X(dev) && obj->tiling_mode == I915_TILING_Y) + return VM_FAULT_SIGBUS; + /* Now bind it into the GTT if needed */ if (!obj->map_and_fenceable) { ret = i915_gem_object_unbind(obj); @@ -1452,8 +1457,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;