From mboxrd@z Thu Jan  1 00:00:00 1970
From: Chris Wilson <chris@chris-wilson.co.uk>
Subject: Re: [PATCH] drm/i915: Implement workaround for broken
	CS tlb on i830/845
Date: Mon, 17 Dec 2012 15:23:22 +0000
Message-ID: <eeac1e$5dfo10@AZSMGA002.ch.intel.com>
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: <intel-gfx-bounces+gcfxdi-intel-gfx=m.gmane.org@lists.freedesktop.org>
Received: from mga03.intel.com (mga03.intel.com [143.182.124.21])
	by gabe.freedesktop.org (Postfix) with ESMTP id 64313E5CC2
	for <intel-gfx@lists.freedesktop.org>;
	Mon, 17 Dec 2012 07:23:36 -0800 (PST)
In-Reply-To: <453bf0$6trm40@azsmga001.ch.intel.com>
List-Unsubscribe: <http://lists.freedesktop.org/mailman/options/intel-gfx>,
	<mailto:intel-gfx-request@lists.freedesktop.org?subject=unsubscribe>
List-Archive: <http://lists.freedesktop.org/archives/intel-gfx>
List-Post: <mailto:intel-gfx@lists.freedesktop.org>
List-Help: <mailto:intel-gfx-request@lists.freedesktop.org?subject=help>
List-Subscribe: <http://lists.freedesktop.org/mailman/listinfo/intel-gfx>,
	<mailto:intel-gfx-request@lists.freedesktop.org?subject=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 <daniel.vetter@ffwll.ch>
List-Id: intel-gfx@lists.freedesktop.org

On Mon, 17 Dec 2012 15:18:41 +0000, Chris Wilson <chris@chris-wilson.co.uk> 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;

> +
> +               obj = ring->private;
> +               if (acthd >= obj->gtt_offset &&
> +                   acthd <= obj->gtt_offset + obj->base.size)
> +                       return i915_error_object_create(dev_priv, obj);
> +       }

-- 
Chris Wilson, Intel Open Source Technology Centre