drm/i915: Consolidate reporting of "missed breadcrumbs"

Move the setting of gpu_error->missed_irq_ring bit to a common function
so that we can get the debug logging for either path.

v2: Add %pF caller

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Reviewed-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/20170228085018.3225-1-chris@chris-wilson.co.uk

diff --git a/drivers/gpu/drm/i915/intel_breadcrumbs.c b/drivers/gpu/drm/i915/intel_breadcrumbs.c
index 7c7867d65a3908d896bb27c555daedaf82bab8ce..5752f23fd289bad174435fd58cfe95e19250b2ec 100644 (file)
--- a/drivers/gpu/drm/i915/intel_breadcrumbs.c
+++ b/drivers/gpu/drm/i915/intel_breadcrumbs.c
@@ -59,6 +59,16 @@ static unsigned long wait_timeout(void)
        return round_jiffies_up(jiffies + DRM_I915_HANGCHECK_JIFFIES);
 }
 
+static noinline void missed_breadcrumb(struct intel_engine_cs *engine)
+{
+       DRM_DEBUG_DRIVER("%s missed breadcrumb at %pF, irq posted? %s\n",
+                        engine->name, __builtin_return_address(0),
+                        yesno(test_bit(ENGINE_IRQ_BREADCRUMB,
+                                       &engine->irq_posted)));
+
+       set_bit(engine->id, &engine->i915->gpu_error.missed_irq_rings);
+}
+
 static void intel_breadcrumbs_hangcheck(unsigned long data)
 {
        struct intel_engine_cs *engine = (struct intel_engine_cs *)data;
@@ -86,8 +96,7 @@ static void intel_breadcrumbs_hangcheck(unsigned long data)
         * DRM_I915_HANGCHECK_JIFFIES [1.5s]!
         */
        if (intel_engine_wakeup(engine) & ENGINE_WAKEUP_ASLEEP) {
-               DRM_DEBUG("Hangcheck timer elapsed... %s idle\n", engine->name);
-               set_bit(engine->id, &engine->i915->gpu_error.missed_irq_rings);
+               missed_breadcrumb(engine);
                mod_timer(&engine->breadcrumbs.fake_irq, jiffies + 1);
        } else {
                mod_timer(&b->hangcheck, wait_timeout());
@@ -180,7 +189,7 @@ void intel_engine_disarm_breadcrumbs(struct intel_engine_cs *engine)
         * completion.
         */
        if (__intel_breadcrumbs_wakeup(b) & ENGINE_WAKEUP_ASLEEP)
-               set_bit(engine->id, &engine->i915->gpu_error.missed_irq_rings);
+               missed_breadcrumb(engine);
 
        __intel_engine_disarm_breadcrumbs(engine);