drm/i915: Consolidate reporting of "missed breadcrumbs"

Commit Message

Chris Wilson Feb. 28, 2017, 8:50 a.m. UTC

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 <[e-mail]>
Cc: Tvrtko Ursulin <[e-mail]>
Reviewed-by: Tvrtko Ursulin <[e-mail]>
---
 drivers/gpu/drm/i915/intel_breadcrumbs.c | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

Comments

Chris Wilson Feb. 28, 2017, 11:48 a.m. UTC | #1

On Tue, Feb 28, 2017 at 09:52:30AM -0000, Patchwork wrote:
> == Series Details ==
> 
> Series: drm/i915: Consolidate reporting of "missed breadcrumbs" (rev3)
> URL   : https://patchwork.freedesktop.org/series/20330/
> State : warning
> 
> == Summary ==
> 
> Series 20330v3 drm/i915: Consolidate reporting of "missed breadcrumbs"
> https://patchwork.freedesktop.org/api/1.0/series/20330/revisions/3/mbox/
> 
> Test kms_cursor_legacy:
>         Subgroup basic-flip-before-cursor-varying-size:
>                 pass       -> DMESG-WARN (fi-byt-n2820)

Pushed to get some more feedback on snb/CI that has started to detect
missed interrupts.
-Chris

Patch

diff --git a/drivers/gpu/drm/i915/intel_breadcrumbs.c b/drivers/gpu/drm/i915/intel_breadcrumbs.c
index 7c7867d65a39..ce32186f8cb1 100644
--- 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);
 }
 
+noinline static 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);