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>

diff --git a/drivers/gpu/drm/i915/intel_lrc.c b/drivers/gpu/drm/i915/intel_lrc.c
index 753458452997ac2f72f1d92d97fceb0b6a36f9c1..44a92ea464bafde8060fffea7ae8c52b24bed03e 100644 (file)
--- a/drivers/gpu/drm/i915/intel_lrc.c
+++ b/drivers/gpu/drm/i915/intel_lrc.c
@@ -508,9 +508,15 @@ bool intel_execlists_idle(struct drm_i915_private *dev_priv)
        if (!i915.enable_execlists)
                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))
                        return false;
+       }
 
        return true;
 }