diff options
| author | Chris Wilson <chris@chris-wilson.co.uk> | 2017-02-12 18:19:59 +0100 |
|---|---|---|
| committer | Jani Nikula <jani.nikula@intel.com> | 2017-03-14 14:07:38 +0100 |
| commit | 1b2e5ea0b7061be3ffdcd85918c2f428edace4ba (patch) | |
| tree | 62aa0a02304a125d7f843c9803dd23ec6b6139a6 /drivers/gpu | |
| parent | drm/i915: Stop using RP_DOWN_EI on Baytrail (diff) | |
| download | linux-1b2e5ea0b7061be3ffdcd85918c2f428edace4ba.tar.xz linux-1b2e5ea0b7061be3ffdcd85918c2f428edace4ba.zip | |
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>
Diffstat (limited to 'drivers/gpu')
| -rw-r--r-- | drivers/gpu/drm/i915/i915_drv.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c index 6cd78bb2064d..1c75402a59c1 100644 --- a/drivers/gpu/drm/i915/i915_drv.c +++ b/drivers/gpu/drm/i915/i915_drv.c @@ -1809,10 +1809,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; |