> -----Original Message----- > From: Daniel Vetter [mailto:daniel.vetter@xxxxxxxx] On Behalf Of Daniel > Vetter > Sent: Wednesday, June 18, 2014 9:50 PM > To: Mateo Lozano, Oscar > Cc: intel-gfx@xxxxxxxxxxxxxxxxxxxxx > Subject: Re: [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@xxxxxxxxx wrote: > > From: Oscar Mateo <oscar.mateo@xxxxxxxxx> > > > > 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@xxxxxxxxx> > > --- > > 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´ll have to INIT_LIST_HEAD in both the legacy and the new ring init but, now that you mention it, that´s probably a good idea :D _______________________________________________ Intel-gfx mailing list Intel-gfx@xxxxxxxxxxxxxxxxxxxxx http://lists.freedesktop.org/mailman/listinfo/intel-gfx
