projects
/
platform
/
kernel
/
linux-rpi.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
c00122f
)
drm/i915: Always call i915_gem_reset_finish() following i915_gem_reset_prepare()
author
Chris Wilson
<chris@chris-wilson.co.uk>
Sun, 12 Feb 2017 17:19:59 +0000
(17:19 +0000)
committer
Chris Wilson
<chris@chris-wilson.co.uk>
Mon, 13 Feb 2017 11:18:18 +0000
(11:18 +0000)
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>
drivers/gpu/drm/i915/i915_drv.c
patch
|
blob
|
history
diff --git
a/drivers/gpu/drm/i915/i915_drv.c
b/drivers/gpu/drm/i915/i915_drv.c
index
221f1c5
..
ac1b358
100644
(file)
--- 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;