Commit 8d613c53 authored Feb 12, 2017 by Chris Wilson

drm/i915: Always call i915_gem_reset_finish() following i915_gem_reset_prepare()

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@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/20170212172002.23072-2-chris@chris-wilson.co.uk

Reviewed-by: Mika Kuoppala <mika.kuoppala@intel.com>

parent c00122f3

drivers/gpu/drm/i915/i915_drv.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -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;