]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commit
drm/i915: Differentiate between hangcheck waiting for timer or scheduler
authorChris Wilson <chris@chris-wilson.co.uk>
Fri, 3 Mar 2017 09:00:56 +0000 (09:00 +0000)
committerChris Wilson <chris@chris-wilson.co.uk>
Fri, 3 Mar 2017 09:39:39 +0000 (09:39 +0000)
commit8352aea3c3f44ea9065b77d3baedc58921710d49
tree0bb7a5fc43d22eb9340967ab77590288dbd076c4
parentc8659efac544b7df1106022d78617a1ca1d9a38c
drm/i915: Differentiate between hangcheck waiting for timer or scheduler

Check timer_pending() as well as work_pending() to see if the timer for
the hangcheck has already expired and the work is pending execution on
some list somewhere.

v2: Use a more compact if-chain

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Mika Kuoppala <mika.kuoppala@linux.intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/20170303090056.19973-1-chris@chris-wilson.co.uk
Reviewed-by: Mika Kuoppala <mika.kuoppala@linux.intel.com>
drivers/gpu/drm/i915/i915_debugfs.c