diff options
| author | John Harrison <John.C.Harrison@Intel.com> | 2015-01-14 15:40:37 +0000 |
|---|---|---|
| committer | John Harrison <John.C.Harrison@Intel.com> | 2016-05-06 14:13:03 +0100 |
| commit | ee5b1f8d908388ebc0cf2ba88e79c4cd2b3b77bf (patch) | |
| tree | f85d4d36dd9ed0691334dd691299ef3f6d25bbba | |
| parent | 9f71cf32e83dc7c4585ea687b7328396e7bc531b (diff) | |
drm/i915: Add scheduler support functions for TDR
The TDR code needs to know what the scheduler is up to in order to
work out whether a ring is really hung or not.
v4: Removed some unnecessary braces to keep the style checker happy.
v5: Removed white space and added documentation. [Joonas Lahtinen]
Also updated for new module parameter.
v6: Updated to newer nightly (lots of ring -> engine renaming).
Added 'for_each_scheduler_node()' helper macro. Updated to use
'to_i915()' instead of dev_private. [review feedback from Joonas
Lahtinen]
For: VIZ-1587
Signed-off-by: John Harrison <John.C.Harrison@Intel.com>
Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
| -rw-r--r-- | drivers/gpu/drm/i915/i915_scheduler.c | 33 | ||||
| -rw-r--r-- | drivers/gpu/drm/i915/i915_scheduler.h | 1 |
2 files changed, 34 insertions, 0 deletions
diff --git a/drivers/gpu/drm/i915/i915_scheduler.c b/drivers/gpu/drm/i915/i915_scheduler.c index 123f1dcd5a26..d1f819c95750 100644 --- a/drivers/gpu/drm/i915/i915_scheduler.c +++ b/drivers/gpu/drm/i915/i915_scheduler.c @@ -1390,3 +1390,36 @@ void i915_scheduler_closefile(struct drm_device *dev, struct drm_file *file) spin_unlock_irq(&scheduler->lock); } + +/** + * i915_scheduler_is_engine_flying - does the given engine have in flight batches? + * @engine: Engine to query + * Used by TDR to distinguish hung engines (not moving but with work to do) + * from idle engines (not moving because there is nothing to do). Returns true + * if the given engine has batches currently executing on the hardware. + */ +bool i915_scheduler_is_engine_flying(struct intel_engine_cs *engine) +{ + struct drm_i915_private *dev_priv = to_i915(engine->dev); + struct i915_scheduler *scheduler = dev_priv->scheduler; + struct i915_scheduler_queue_entry *node; + unsigned long flags; + bool found = false; + + /* With the scheduler in bypass mode, no information can be returned. */ + if (!i915.enable_scheduler) + return true; + + spin_lock_irqsave(&scheduler->lock, flags); + + for_each_scheduler_node(node, engine->id) { + if (I915_SQS_IS_FLYING(node)) { + found = true; + break; + } + } + + spin_unlock_irqrestore(&scheduler->lock, flags); + + return found; +} diff --git a/drivers/gpu/drm/i915/i915_scheduler.h b/drivers/gpu/drm/i915/i915_scheduler.h index 464c051fede6..0017b40f1314 100644 --- a/drivers/gpu/drm/i915/i915_scheduler.h +++ b/drivers/gpu/drm/i915/i915_scheduler.h @@ -145,6 +145,7 @@ void i915_scheduler_clean_node(struct i915_scheduler_queue_entry *node); int i915_scheduler_queue_execbuffer(struct i915_scheduler_queue_entry *qe); bool i915_scheduler_notify_request(struct drm_i915_gem_request *req); void i915_scheduler_wakeup(struct drm_device *dev); +bool i915_scheduler_is_engine_flying(struct intel_engine_cs *engine); void i915_scheduler_work_handler(struct work_struct *work); int i915_scheduler_flush(struct intel_engine_cs *engine, bool is_locked); int i915_scheduler_flush_stamp(struct intel_engine_cs *engine, |