From mboxrd@z Thu Jan  1 00:00:00 1970
From: Ville =?iso-8859-1?Q?Syrj=E4l=E4?= <ville.syrjala@linux.intel.com>
Subject: Re: [PATCH] drm/i915: Reset the HEAD pointer for the
 ring after writing START
Date: Thu, 7 Aug 2014 19:05:49 +0300
Message-ID: <20140807160548.GC4193@intel.com>
References: <20140807142620.GB4193@intel.com>
 <1407422394-29792-1-git-send-email-chris@chris-wilson.co.uk>
Mime-Version: 1.0
Content-Type: text/plain; charset="iso-8859-1"
Content-Transfer-Encoding: quoted-printable
Return-path: <intel-gfx-bounces@lists.freedesktop.org>
Received: from mga11.intel.com (mga11.intel.com [192.55.52.93])
 by gabe.freedesktop.org (Postfix) with ESMTP id 2F9D76E369
 for <intel-gfx@lists.freedesktop.org>; Thu,  7 Aug 2014 09:06:51 -0700 (PDT)
Content-Disposition: inline
In-Reply-To: <1407422394-29792-1-git-send-email-chris@chris-wilson.co.uk>
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>
Errors-To: intel-gfx-bounces@lists.freedesktop.org
Sender: "Intel-gfx" <intel-gfx-bounces@lists.freedesktop.org>
To: Chris Wilson <chris@chris-wilson.co.uk>
Cc: intel-gfx@lists.freedesktop.org
List-Id: intel-gfx@lists.freedesktop.org

On Thu, Aug 07, 2014 at 03:39:54PM +0100, Chris Wilson wrote:
> Ville found an old w/a documented for g4x that suggested that we need to
> reset the HEAD after writing START. This is a useful fixup for some of
> the g4x ring initialisation woes, but as usual, not all.
> =

> v2: Do the rewrite unconditionally anyway
> =

> References: https://bugs.freedesktop.org/show_bug.cgi?id=3D76554
> Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
> Cc: Ville Syrj=E4l=E4 <ville.syrjala@linux.intel.com>

Yeah looks sensible to me. So based on my gut feeling just from the
seeing the w/a name this is:

Reviewed-by: Ville Syrj=E4l=E4 <ville.syrjala@linux.intel.com>

> ---
>  drivers/gpu/drm/i915/intel_ringbuffer.c | 8 ++++++++
>  1 file changed, 8 insertions(+)
> =

> diff --git a/drivers/gpu/drm/i915/intel_ringbuffer.c b/drivers/gpu/drm/i9=
15/intel_ringbuffer.c
> index 45e3ec927051..26ec25afc02a 100644
> --- a/drivers/gpu/drm/i915/intel_ringbuffer.c
> +++ b/drivers/gpu/drm/i915/intel_ringbuffer.c
> @@ -537,6 +537,14 @@ static int init_ring_common(struct intel_engine_cs *=
ring)
>  	 * also enforces ordering), otherwise the hw might lose the new ring
>  	 * register values. */
>  	I915_WRITE_START(ring, i915_gem_obj_ggtt_offset(obj));
> +
> +	/* WaClearRingBufHeadRegAtInit:ctg,elk */
> +	if (I915_READ_HEAD(ring))
> +		DRM_DEBUG("%s initialization failed [head=3D%08x], fudging\n",
> +			  ring->name, I915_READ_HEAD(ring));
> +	I915_WRITE_HEAD(ring, 0);
> +	(void)I915_READ_HEAD(ring);
> +
>  	I915_WRITE_CTL(ring,
>  			((ringbuf->size - PAGE_SIZE) & RING_NR_PAGES)
>  			| RING_VALID);
> -- =

> 2.1.0.rc1

-- =

Ville Syrj=E4l=E4
Intel OTC