diff options
| author | Chris Wilson <chris@chris-wilson.co.uk> | 2017-02-01 13:12:22 +0000 |
|---|---|---|
| committer | Chris Wilson <chris@chris-wilson.co.uk> | 2017-02-01 15:23:06 +0000 |
| commit | 453cfe21711f644e744e834d5c61042b2fac218d (patch) | |
| tree | 9c201566c75bd26ac5a7711bf49bc0d2dfb95ac0 /drivers/gpu/drm/i915/intel_lrc.c | |
| parent | e2de845e0b84ebb7e910bb898febbf813b7df483 (diff) | |
| download | op-kernel-dev-453cfe21711f644e744e834d5c61042b2fac218d.zip op-kernel-dev-453cfe21711f644e744e834d5c61042b2fac218d.tar.gz | |
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>
Diffstat (limited to 'drivers/gpu/drm/i915/intel_lrc.c')
| -rw-r--r-- | drivers/gpu/drm/i915/intel_lrc.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/intel_lrc.c b/drivers/gpu/drm/i915/intel_lrc.c index 7534584..44a92ea 100644 --- 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; } |
