diff options
| author | John Harrison <John.C.Harrison@Intel.com> | 2016-05-05 16:04:53 +0100 |
|---|---|---|
| committer | John Harrison <John.C.Harrison@Intel.com> | 2016-06-28 17:19:31 +0100 |
| commit | a19e0b93201c97e95dcc19e894b63e0abeeb4dea (patch) | |
| tree | aa141c8e956b5b924c175332719427fdeca23439 | |
| parent | 8472923abf1643d6eeb7286bca51732ceb88f01b (diff) | |
Mush: query stats
| -rw-r--r-- | drivers/gpu/drm/i915/i915_scheduler.c | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/drivers/gpu/drm/i915/i915_scheduler.c b/drivers/gpu/drm/i915/i915_scheduler.c index 723560d65361..4fde0829e260 100644 --- a/drivers/gpu/drm/i915/i915_scheduler.c +++ b/drivers/gpu/drm/i915/i915_scheduler.c @@ -1958,12 +1958,16 @@ int i915_scheduler_query_stats(struct intel_engine_cs *engine, stats->counts[node->status]++; } - WARN(stats->counts[I915_SQS_QUEUED] != scheduler->counts[engine->id].queued, - "Queued count mis-match: %d vs %d!\n", - stats->counts[I915_SQS_QUEUED], scheduler->counts[engine->id].queued); - WARN(stats->counts[I915_SQS_FLYING] != scheduler->counts[engine->id].flying, - "Flying count mis-match: %d vs %d!\n", - stats->counts[I915_SQS_FLYING], scheduler->counts[engine->id].flying); + WARN((stats->counts[I915_SQS_QUEUED] + stats->counts[I915_SQS_PREEMPTED]) + != scheduler->counts[engine->id].queued, + "Queued count mis-match: %d + %d vs %d!\n", + stats->counts[I915_SQS_QUEUED], stats->counts[I915_SQS_PREEMPTED], + scheduler->counts[engine->id].queued); + WARN((stats->counts[I915_SQS_FLYING] + stats->counts[I915_SQS_OVERTAKING]) + != scheduler->counts[engine->id].flying, + "Flying count mis-match: %d + %d vs %d!\n", + stats->counts[I915_SQS_FLYING], stats->counts[I915_SQS_OVERTAKING], + scheduler->counts[engine->id].flying); spin_unlock_irq(&scheduler->lock); |