drm/i915: Only call tasklet_kill() on the first prepare_reset
authorChris Wilson <chris@chris-wilson.co.uk>
Wed, 7 Mar 2018 13:42:26 +0000 (13:42 +0000)
committerJoonas Lahtinen <joonas.lahtinen@linux.intel.com>
Fri, 16 Mar 2018 12:35:35 +0000 (14:35 +0200)
commit73e2232aa3253d77935112bfc218700f6a2f1000
treee7cd5ca947a0e1df1bd4e1ef8abdb794945a2e3c
parent7e9d3a4a1b21fd8a595774697f4047e7505deea6
drm/i915: Only call tasklet_kill() on the first prepare_reset

tasklet_kill() will spin waiting for the current tasklet to be executed.
However, if tasklet_disable() has been called, then the tasklet is never
executed but permanently put back onto the runlist until
tasklet_enable() is called. Ergo, we cannot use tasklet_kill() inside a
disable/enable pair. This is the case when we call set-wedge from inside
i915_reset(), and another request was submitted to us concurrent to the
reset.

Fixes: 963ddd63c314 ("drm/i915: Suspend submission tasklets around wedging")
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Mika Kuoppala <mika.kuoppala@linux.intel.com>
Reviewed-by: Mika Kuoppala <mika.kuoppala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20180307134226.25492-6-chris@chris-wilson.co.uk
(cherry picked from commit 68ad361285a9cc73b259f59adbaafde196c15987)
Signed-off-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
drivers/gpu/drm/i915/i915_gem.c