Skip to content

Commit

Permalink
drm/i915: Always call i915_gem_reset_finish() following i915_gem_rese…
Browse files Browse the repository at this point in the history
…t_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>
  • Loading branch information
ickle committed Feb 13, 2017
1 parent c00122f commit 8d613c5
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion drivers/gpu/drm/i915/i915_drv.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down

0 comments on commit 8d613c5

Please sign in to comment.