]> git.baikalelectronics.ru Git - kernel.git/commit
drm/i915: Only reset hangcheck at the start of an activity cycle
authorChris Wilson <chris@chris-wilson.co.uk>
Mon, 9 Jul 2018 13:01:59 +0000 (14:01 +0100)
committerChris Wilson <chris@chris-wilson.co.uk>
Tue, 10 Jul 2018 10:12:15 +0000 (11:12 +0100)
commit451fdebf73e4565501ad97fc042db6b9bbd33972
treeb2dd6172d82b4f48ec3d6899fb02da1a47cf315d
parentbd9b57a14be64d87a847664dbd90f32e373508ac
drm/i915: Only reset hangcheck at the start of an activity cycle

Across a reset, the seqno (and thus hangcheck) should restart and the
hangcheck naturally progress, for when it does not, we want to declare an
emergency. Currently, we only detect if reset and reinit fails, but we
do not detect if the call to reinit succeeds but the HW is fried - as we
are resetting hangcheck on initialisation the engine. Remove that and
rely on the natural progress to reset the hangcheck timer.

References: b557375e5345 ("drm/i915: Mark the hangcheck as idle when unparking the engines")
References: 75b942b9ca2a ("drm/i915: Declare the driver wedged if hangcheck makes no progress")
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/20180709130208.11730-2-chris@chris-wilson.co.uk
drivers/gpu/drm/i915/intel_lrc.c
drivers/gpu/drm/i915/intel_ringbuffer.c