[Intel-gfx] [PATCH] drm/i915: Differentiate between hangcheck waiting for timer or scheduler

[Chris Wilson]

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.

Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>
Cc: Mika Kuoppala <mika.kuoppala at linux.intel.com>
---
 drivers/gpu/drm/i915/i915_debugfs.c | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/drivers/gpu/drm/i915/i915_debugfs.c b/drivers/gpu/drm/i915/i915_debugfs.c
index ee4bf6f71cab..0656ccf0e0d4 100644
--- a/drivers/gpu/drm/i915/i915_debugfs.c
+++ b/drivers/gpu/drm/i915/i915_debugfs.c
@@ -1334,11 +1334,14 @@ static int i915_hangcheck_info(struct seq_file *m, void *unused)
 
 	intel_runtime_pm_put(dev_priv);
 
-	if (delayed_work_pending(&dev_priv->gpu_error.hangcheck_work)) {
-		seq_printf(m, "Hangcheck active, fires in %dms\n",
-			   jiffies_to_msecs(dev_priv->gpu_error.hangcheck_work.timer.expires -
-					    jiffies));
-	} else
+	if (delayed_work_pending(&dev_priv->gpu_error.hangcheck_work))
+		if (timer_pending(&dev_priv->gpu_error.hangcheck_work.timer))
+			seq_printf(m, "Hangcheck active, timer fires in %dms\n",
+				   jiffies_to_msecs(dev_priv->gpu_error.hangcheck_work.timer.expires -
+						    jiffies));
+		else
+			seq_printf(m, "Hangcheck active, work pending\n");
+	else
 		seq_printf(m, "Hangcheck inactive\n");
 
 	seq_printf(m, "GT active? %s\n", yesno(dev_priv->gt.awake));
-- 
2.11.0