]> git.baikalelectronics.ru Git - kernel.git/commit
drm/i915: Don't continually defer the hangcheck
authorChris Wilson <chris@chris-wilson.co.uk>
Wed, 19 Nov 2014 09:47:19 +0000 (09:47 +0000)
committerDaniel Vetter <daniel.vetter@ffwll.ch>
Wed, 19 Nov 2014 10:44:50 +0000 (11:44 +0100)
commitb48c6a0c006268a65d625db33c8b7ab47d46f7b0
tree0fa877be4ee85371dbba03d51bd63c8ccf067867
parent0f56bf2b9e68c12d4aca68fdc2a048090960beea
drm/i915: Don't continually defer the hangcheck

With multiple rings, we may continue to render on the blitter whilst
executing an infinite shader on the render ring. As we currently, rearm
the timer with each execbuf, in this scenario the hangcheck will never
fire and we will never detect the lockup on the render ring. Instead,
only arm the timer once per hangcheck, so that hangcheck runs more
frequently.

v2: Rearrange code to avoid triggering a BUG_ON in add_timer from
softirq context.

Testcase: igt/gem_reset_stats/defer-hangcheck*
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=86225
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Mika Kuoppala <mika.kuoppala@intel.com>
Reviewed-by: Mika Kuoppala <mika.kuoppala@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
drivers/gpu/drm/i915/i915_irq.c