From mboxrd@z Thu Jan 1 00:00:00 1970 From: Daniel Vetter Subject: Re: [PATCH] drm/i915: Implement workaround for broken CS tlb on i830/845 Date: Mon, 17 Dec 2012 16:30:35 +0100 Message-ID: <20121217153035.GR5737@phenom.ffwll.local> References: <1355697960-8063-1-git-send-email-chris@chris-wilson.co.uk> <6c3329$7mbtk2@orsmga002.jf.intel.com> <453bf0$6trm40@azsmga001.ch.intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Received: from mail-wg0-f45.google.com (mail-wg0-f45.google.com [74.125.82.45]) by gabe.freedesktop.org (Postfix) with ESMTP id ED721E5D2E for ; Mon, 17 Dec 2012 07:29:01 -0800 (PST) Received: by mail-wg0-f45.google.com with SMTP id dq12so2622149wgb.12 for ; Mon, 17 Dec 2012 07:29:01 -0800 (PST) Content-Disposition: inline In-Reply-To: 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: Chris Wilson Cc: Daniel Vetter , intel-gfx@lists.freedesktop.org List-Id: intel-gfx@lists.freedesktop.org On Mon, Dec 17, 2012 at 03:23:22PM +0000, Chris Wilson wrote: > On Mon, 17 Dec 2012 15:18:41 +0000, Chris Wilson wrote: > > 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); > > All the implicit knowledge here is making me worried: > > if (WARN_ON(ring->id != RCS)) return NULL; Applied both fixups and merged to -fixes, with the little s/<=/