diff options
| author | Chris Wilson <chris@chris-wilson.co.uk> | 2017-10-27 12:06:16 +0100 |
|---|---|---|
| committer | Chris Wilson <chris@chris-wilson.co.uk> | 2017-11-01 15:09:12 +0000 |
| commit | 680273879d125d644831b8de42c66576e6290378 (patch) | |
| tree | aff4f1078ae3b9c089f37bf25dd7c28e075e2a6c /drivers/gpu/drm/i915/intel_engine_cs.c | |
| parent | e5330ac1f50b897d245753828e8887f297f69dd0 (diff) | |
drm/i915: Move parking-while-active warning to intel_engines_park()
We will want to break this down to give detailed per-engine warnings as
to why we still think we are active as we attempt to park the engines.
For the first step, just move the warning verbatim from the idle-worker
to intel_engines_park().
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: https://patchwork.freedesktop.org/patch/msgid/20171027110617.31745-3-chris@chris-wilson.co.uk
Reviewed-by: Mika Kuoppala <mika.kuoppala@linux.intel.com>
Diffstat (limited to 'drivers/gpu/drm/i915/intel_engine_cs.c')
| -rw-r--r-- | drivers/gpu/drm/i915/intel_engine_cs.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/drivers/gpu/drm/i915/intel_engine_cs.c b/drivers/gpu/drm/i915/intel_engine_cs.c index f31f2d6384c3..9767586e2289 100644 --- a/drivers/gpu/drm/i915/intel_engine_cs.c +++ b/drivers/gpu/drm/i915/intel_engine_cs.c @@ -1613,6 +1613,13 @@ void intel_engines_park(struct drm_i915_private *i915) struct intel_engine_cs *engine; enum intel_engine_id id; + /* + * We are committed now to parking the engines, make sure there + * will be no more interrupts arriving later. + */ + if (!intel_engines_are_idle(dev_priv)) + DRM_ERROR("Timeout waiting for engines to idle\n"); + for_each_engine(engine, i915, id) { if (engine->park) engine->park(engine); |