diff mbox

[2/2] drm/i915: Mark the hangcheck as idle when unparking the engines

Message ID 20180502220313.6459-2-chris@chris-wilson.co.uk (mailing list archive)
State New, archived
Headers show

Commit Message

Chris Wilson May 2, 2018, 10:03 p.m. UTC
As we unpark the engines and are about to begin a new cycle of activity,
mark the current status of the hangceck as idle so that we avoid
carrying over a stale timestamp/action into the next cycle.

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

Comments

Joonas Lahtinen May 3, 2018, 9:39 a.m. UTC | #1
Quoting Chris Wilson (2018-05-03 01:03:13)
> As we unpark the engines and are about to begin a new cycle of activity,
> mark the current status of the hangceck as idle so that we avoid
> carrying over a stale timestamp/action into the next cycle.
> 
> Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
> Cc: Mika Kuoppala <mika.kuoppala@linux.intel.com>

Reviewed-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>

Regards, joonas
Chris Wilson May 3, 2018, 9:49 a.m. UTC | #2
Quoting Joonas Lahtinen (2018-05-03 10:39:12)
> Quoting Chris Wilson (2018-05-03 01:03:13)
> > As we unpark the engines and are about to begin a new cycle of activity,
> > mark the current status of the hangceck as idle so that we avoid
> > carrying over a stale timestamp/action into the next cycle.
> > 
> > Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
> > Cc: Mika Kuoppala <mika.kuoppala@linux.intel.com>
> 
> Reviewed-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>

Thanks, applied and let's see if this clears up a few rare spurious hangs
in CI.
-Chris
diff mbox

Patch

diff --git a/drivers/gpu/drm/i915/intel_engine_cs.c b/drivers/gpu/drm/i915/intel_engine_cs.c
index 9164e6d665f8..b064ef15158a 100644
--- a/drivers/gpu/drm/i915/intel_engine_cs.c
+++ b/drivers/gpu/drm/i915/intel_engine_cs.c
@@ -1075,6 +1075,8 @@  void intel_engines_unpark(struct drm_i915_private *i915)
 	for_each_engine(engine, i915, id) {
 		if (engine->unpark)
 			engine->unpark(engine);
+
+		intel_engine_init_hangcheck(engine);
 	}
 }