OSDN Git Service
(root)
/
tomoyo
/
tomoyo-test1.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
e2de845
)
drm/i915/execlists: Add interrupt-pending check to intel_execlists_idle()
author
Chris Wilson
<chris@chris-wilson.co.uk>
Wed, 1 Feb 2017 13:12:22 +0000
(13:12 +0000)
committer
Chris Wilson
<chris@chris-wilson.co.uk>
Wed, 1 Feb 2017 15:23:06 +0000
(15:23 +0000)
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>
drivers/gpu/drm/i915/intel_lrc.c
patch
|
blob
|
history
diff --git
a/drivers/gpu/drm/i915/intel_lrc.c
b/drivers/gpu/drm/i915/intel_lrc.c
index
7534584
..
44a92ea
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;
}