[Intel-gfx] [PATCH 3/6] drm/i915: Keep a count of requests submitted from userspace

[Tvrtko Ursulin]

From: Tvrtko Ursulin <tvrtko.ursu...@intel.com>

Keep a count of requests submitted from userspace and not yet runnable due
unresolved dependencies.

v2: Rename and move under the container struct. (Chris Wilson)

Signed-off-by: Tvrtko Ursulin <tvrtko.ursu...@intel.com>
---
 drivers/gpu/drm/i915/i915_gem_request.c | 3 +++
 drivers/gpu/drm/i915/intel_engine_cs.c  | 3 ++-
 drivers/gpu/drm/i915/intel_ringbuffer.h | 8 ++++++++
 3 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/i915/i915_gem_request.c 
b/drivers/gpu/drm/i915/i915_gem_request.c
index 19b8714a8d2f..9bb74836c602 100644
--- a/drivers/gpu/drm/i915/i915_gem_request.c
+++ b/drivers/gpu/drm/i915/i915_gem_request.c
@@ -610,6 +610,7 @@ submit_notify(struct i915_sw_fence *fence, enum 
i915_sw_fence_notify state)
                rcu_read_lock();
                request->engine->submit_request(request);
                rcu_read_unlock();
+               atomic_dec(&request->engine->request_stats.queued);
                break;
 
        case FENCE_FREE:
@@ -1083,6 +1084,8 @@ void __i915_add_request(struct drm_i915_gem_request 
*request, bool flush_caches)
        if (engine->schedule)
                engine->schedule(request, request->ctx->priority);
 
+       atomic_inc(&engine->request_stats.queued);
+
        local_bh_disable();
        i915_sw_fence_commit(&request->submit);
        local_bh_enable(); /* Kick the execlists tasklet if just scheduled */
diff --git a/drivers/gpu/drm/i915/intel_engine_cs.c 
b/drivers/gpu/drm/i915/intel_engine_cs.c
index da5b592ce49f..e861b5404a78 100644
--- a/drivers/gpu/drm/i915/intel_engine_cs.c
+++ b/drivers/gpu/drm/i915/intel_engine_cs.c
@@ -1727,12 +1727,13 @@ void intel_engine_dump(struct intel_engine_cs *engine,
        if (i915_terminally_wedged(&engine->i915->gpu_error))
                drm_printf(m, "*** WEDGED ***\n");
 
-       drm_printf(m, "\tcurrent seqno %x, last %x, hangcheck %x [%d ms], 
inflight %d, runnable %u\n",
+       drm_printf(m, "\tcurrent seqno %x, last %x, hangcheck %x [%d ms], 
inflight %d, queued %u, runnable %u\n",
                   intel_engine_get_seqno(engine),
                   intel_engine_last_submit(engine),
                   engine->hangcheck.seqno,
                   jiffies_to_msecs(jiffies - 
engine->hangcheck.action_timestamp),
                   engine->timeline->inflight_seqnos,
+                  atomic_read(&engine->request_stats.queued),
                   engine->request_stats.runnable);
        drm_printf(m, "\tReset count: %d (global %d)\n",
                   i915_reset_engine_count(error, engine),
diff --git a/drivers/gpu/drm/i915/intel_ringbuffer.h 
b/drivers/gpu/drm/i915/intel_ringbuffer.h
index 43942cd17212..6309e761bf69 100644
--- a/drivers/gpu/drm/i915/intel_ringbuffer.h
+++ b/drivers/gpu/drm/i915/intel_ringbuffer.h
@@ -311,6 +311,14 @@ struct intel_engine_cs {
        struct drm_i915_gem_object *default_state;
 
        struct {
+               /**
+                * @queued: Number of submitted requests with dependencies.
+                *
+                * Count of requests waiting for dependencies before they can be
+                * submitted to the backend.
+                */
+               atomic_t queued;
+
                /**
                 * @runnable: Number of runnable requests sent to the backend.
                 *
-- 
2.14.1

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx