Chris Wilson <chris@xxxxxxxxxxxxxxxxxx> writes: > As i915_gem_reset_finish() undoes the steps from > i915_gem_reset_prepare() to leave the system in a fully-working state, > e.g. to be able to free the breadcrumb signal threads, make sure that we > always call it even on the error path. > > Signed-off-by: Chris Wilson <chris@xxxxxxxxxxxxxxxxxx> Reviewed-by: Mika Kuoppala <mika.kuoppala@xxxxxxxxx> As disable_irq is our guard against rescheduling the tasklet, how about moving the disable/enable_irq() pair onto prepare and finish() functions? -Mika > --- > drivers/gpu/drm/i915/i915_drv.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c > index 555b61bb8a63..1bc2cd3adc84 100644 > --- a/drivers/gpu/drm/i915/i915_drv.c > +++ b/drivers/gpu/drm/i915/i915_drv.c > @@ -1873,10 +1873,10 @@ void i915_reset(struct drm_i915_private *dev_priv) > goto error; > } > > - i915_gem_reset_finish(dev_priv); > i915_queue_hangcheck(dev_priv); > > wakeup: > + i915_gem_reset_finish(dev_priv); > enable_irq(dev_priv->drm.irq); > wake_up_bit(&error->flags, I915_RESET_IN_PROGRESS); > return; > -- > 2.11.0 > > _______________________________________________ > Intel-gfx mailing list > Intel-gfx@xxxxxxxxxxxxxxxxxxxxx > https://lists.freedesktop.org/mailman/listinfo/intel-gfx _______________________________________________ Intel-gfx mailing list Intel-gfx@xxxxxxxxxxxxxxxxxxxxx https://lists.freedesktop.org/mailman/listinfo/intel-gfx
