From mboxrd@z Thu Jan 1 00:00:00 1970 From: Chris Wilson Subject: Re: [PATCH] drm/i915: Implement workaround for broken CS tlb on i830/845 Date: Mon, 17 Dec 2012 15:18:41 +0000 Message-ID: <453bf0$6trm40@azsmga001.ch.intel.com> References: <1355697960-8063-1-git-send-email-chris@chris-wilson.co.uk> <6c3329$7mbtk2@orsmga002.jf.intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Received: from mga03.intel.com (mga03.intel.com [143.182.124.21]) by gabe.freedesktop.org (Postfix) with ESMTP id 6BB1DE5CC2 for ; Mon, 17 Dec 2012 07:18:56 -0800 (PST) In-Reply-To: <6c3329$7mbtk2@orsmga002.jf.intel.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: intel-gfx-bounces+gcfxdi-intel-gfx=m.gmane.org@lists.freedesktop.org Errors-To: intel-gfx-bounces+gcfxdi-intel-gfx=m.gmane.org@lists.freedesktop.org To: intel-gfx@lists.freedesktop.org Cc: Daniel Vetter List-Id: intel-gfx@lists.freedesktop.org On Mon, 17 Dec 2012 13:33:01 +0000, Chris Wilson wrote: > On Sun, 16 Dec 2012 22:46:00 +0000, Chris Wilson wrote: > > @@ -1087,6 +1087,9 @@ i915_error_first_batchbuffer(struct drm_i915_private *dev_priv, > > if (!ring->get_seqno) > > return NULL; > > > > + if (HAS_BROKEN_CS_TLB(dev_priv->dev)) > > + return i915_error_object_create(dev_priv, ring->private); > > Hmm, this is complicated by userspace opting out of the CS w/a, and > imposes quite a burden upon our simple seq interface. One possible solution is: diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c index 6ebdf1e..0e3bd04 100644 --- a/drivers/gpu/drm/i915/i915_irq.c +++ b/drivers/gpu/drm/i915/i915_irq.c @@ -1087,8 +1087,14 @@ i915_error_first_batchbuffer(struct drm_i915_private *dev if (!ring->get_seqno) return NULL; - if (HAS_BROKEN_CS_TLB(dev_priv->dev)) - return i915_error_object_create(dev_priv, ring->private); + if (HAS_BROKEN_CS_TLB(dev_priv->dev)) { + u32 acthd = I915_READ(ACTHD); + + obj = ring->private; + if (acthd >= obj->gtt_offset && + acthd <= obj->gtt_offset + obj->base.size) + return i915_error_object_create(dev_priv, obj); + } seqno = ring->get_seqno(ring, false); list_for_each_entry(obj, &dev_priv->mm.active_list, mm_list) { -- Chris Wilson, Intel Open Source Technology Centre