drm/i915/execlists: Add interrupt-pending check to intel_execlists_idle()

Primarily this serves as a sanity check that the bit has been cleared
before we suspend (and hasn't reappeared after resume).

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Mika Kuoppala <mika.kuoppala@intel.com>
Cc: Tvrtko Ursulin <tursulin@ursulin.net>
Link: http://patchwork.freedesktop.org/patch/msgid/20170201131222.11882-1-chris@chris-wilson.co.uk
Reviewed-by: Mika Kuoppala <mika.kuoppala@intel.com>
This commit is contained in:
Chris Wilson 2017-02-01 13:12:22 +00:00
parent e2de845e0b
commit 453cfe2171
1 changed files with 7 additions and 1 deletions

View File

@ -508,9 +508,15 @@ bool intel_execlists_idle(struct drm_i915_private *dev_priv)
if (!i915.enable_execlists) if (!i915.enable_execlists)
return true; return true;
for_each_engine(engine, dev_priv, id) for_each_engine(engine, dev_priv, id) {
/* Interrupt/tasklet pending? */
if (test_bit(ENGINE_IRQ_EXECLIST, &engine->irq_posted))
return false;
/* Both ports drained, no more ELSP submission? */
if (!execlists_elsp_idle(engine)) if (!execlists_elsp_idle(engine))
return false; return false;
}
return true; return true;
} }