drm/i915: Always call i915_gem_reset_finish() following i915_gem_reset_prepare()
authorChris Wilson <chris@chris-wilson.co.uk>
Sun, 12 Feb 2017 17:19:59 +0000 (17:19 +0000)
committerJani Nikula <jani.nikula@intel.com>
Tue, 14 Mar 2017 13:07:38 +0000 (15:07 +0200)
commit1b2e5ea0b7061be3ffdcd85918c2f428edace4ba
tree62aa0a02304a125d7f843c9803dd23ec6b6139a6
parent8f68d591d4765b2e1ce9d916ac7bc5583285c4ad
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.

Fixes: da9a796f5475 ("drm/i915: Split GEM resetting into 3 phases")
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>
(cherry picked from commit 8d613c539c74fa9055f88f4116196d7c820bd98f)
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
drivers/gpu/drm/i915/i915_drv.c