From mboxrd@z Thu Jan  1 00:00:00 1970
From: "Mateo Lozano, Oscar" <oscar.mateo@intel.com>
Subject: Re: [PATCH 42/53] drm/i915/bdw: Make sure gpu reset
 still works with Execlists
Date: Thu, 19 Jun 2014 09:37:23 +0000
Message-ID: <92648605EABDA246B775AAB04C95A7A3013208B0@IRSMSX103.ger.corp.intel.com>
References: <1402673891-14618-1-git-send-email-oscar.mateo@intel.com>
 <1402673891-14618-43-git-send-email-oscar.mateo@intel.com>
 <20140618205024.GE5821@phenom.ffwll.local>
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 mga09.intel.com (mga09.intel.com [134.134.136.24])
 by gabe.freedesktop.org (Postfix) with ESMTP id BDC726E855
 for <intel-gfx@lists.freedesktop.org>; Thu, 19 Jun 2014 02:37:31 -0700 (PDT)
In-Reply-To: <20140618205024.GE5821@phenom.ffwll.local>
Content-Language: en-US
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: Daniel Vetter <daniel@ffwll.ch>
Cc: "intel-gfx@lists.freedesktop.org" <intel-gfx@lists.freedesktop.org>
List-Id: intel-gfx@lists.freedesktop.org

> -----Original Message-----
> From: Daniel Vetter [mailto:daniel.vetter@ffwll.ch] On Behalf Of Daniel
> Vetter
> Sent: Wednesday, June 18, 2014 9:50 PM
> To: Mateo Lozano, Oscar
> Cc: intel-gfx@lists.freedesktop.org
> Subject: Re: [Intel-gfx] [PATCH 42/53] drm/i915/bdw: Make sure gpu reset
> still works with Execlists
> =

> On Fri, Jun 13, 2014 at 04:38:00PM +0100, oscar.mateo@intel.com wrote:
> > From: Oscar Mateo <oscar.mateo@intel.com>
> >
> > If we reset a ring after a hang, we have to make sure that we clear
> > out all queued Execlists requests.
> >
> > v2: The ring is, at this point, already being correctly re-programmed
> > for Execlists, and the hangcheck counters cleared.
> >
> > Signed-off-by: Oscar Mateo <oscar.mateo@intel.com>
> > ---
> >  drivers/gpu/drm/i915/i915_gem.c | 13 +++++++++++++
> >  1 file changed, 13 insertions(+)
> >
> > diff --git a/drivers/gpu/drm/i915/i915_gem.c
> > b/drivers/gpu/drm/i915/i915_gem.c index 7c10540..86bfb8a 100644
> > --- a/drivers/gpu/drm/i915/i915_gem.c
> > +++ b/drivers/gpu/drm/i915/i915_gem.c
> > @@ -2546,6 +2546,19 @@ static void
> i915_gem_reset_ring_cleanup(struct drm_i915_private *dev_priv,
> >  		i915_gem_free_request(request);
> >  	}
> >
> > +	if (intel_enable_execlists(dev_priv->dev)) {
> > +		while (!list_empty(&ring->execlist_queue)) {
> =

> the execlist_queu should be emtpy for legacy mode, i.e. you can ditch teh=
 if
> here, it's redundant. If not move the INIT_LIST_HEAD ;-) -Daniel

I=B4ll have to INIT_LIST_HEAD in both the legacy and the new ring init but,=
 now that you mention it, that=B4s probably a good idea :D