OSDN Git Service

drm/i915/gt: Cancel the preemption timeout on responding to it
authorChris Wilson <chris@chris-wilson.co.uk>
Fri, 4 Dec 2020 15:12:32 +0000 (15:12 +0000)
committerRodrigo Vivi <rodrigo.vivi@intel.com>
Tue, 8 Dec 2020 15:03:38 +0000 (07:03 -0800)
commit0fe8bf4d3edce7aad6c14b9d5d92ff54dc19f0ba
tree64ab7f296589e9cfa0a7bddbe7c53ada1c027cc9
parent5419d93ffd774127b195b8543b063b2b4fa5aea9
drm/i915/gt: Cancel the preemption timeout on responding to it

We currently presume that the engine reset is successful, cancelling the
expired preemption timer in the process. However, engine resets can
fail, leaving the timeout still pending and we will then respond to the
timeout again next time the tasklet fires. What we want is for the
failed engine reset to be promoted to a full device reset, which is
kicked by the heartbeat once the engine stops processing events.

Closes: https://gitlab.freedesktop.org/drm/intel/-/issues/1168
Fixes: 3a7a92aba8fb ("drm/i915/execlists: Force preemption")
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: <stable@vger.kernel.org> # v5.5+
Reviewed-by: Mika Kuoppala <mika.kuoppala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20201204151234.19729-2-chris@chris-wilson.co.uk
(cherry picked from commit d997e240ceecb4f732611985d3a939ad1bfc1893)
Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
drivers/gpu/drm/i915/gt/intel_lrc.c