浏览代码

drm/i915/tracepoints: Add request submit and execute tracepoints

These new tracepoints are emitted once the request is ready to
be submitted to the GPU and once the request is about to
be submitted to the GPU, respectively.

Former condition triggers as soon as all the fences and
dependencies have been resolved, and the latter once the
backend is about to submit it to the GPU.

New tracepoint are enabled via the new
DRM_I915_LOW_LEVEL_TRACEPOINTS Kconfig option which is disabled
by default to alleviate the performance impact concerns.

v2: Move execute tracepoint to __i915_gem_request_submit.
    (Chris Wilson)

Signed-off-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Tvrtko Ursulin 8 年之前
父节点
当前提交
354d036fcf
共有 3 个文件被更改,包括 37 次插入0 次删除
  1. 11 0
      drivers/gpu/drm/i915/Kconfig.debug
  2. 2 0
      drivers/gpu/drm/i915/i915_gem_request.c
  3. 24 0
      drivers/gpu/drm/i915/i915_trace.h

+ 11 - 0
drivers/gpu/drm/i915/Kconfig.debug

@@ -76,3 +76,14 @@ config DRM_I915_SELFTEST
 	  Recommended for driver developers only.
 	  Recommended for driver developers only.
 
 
 	  If in doubt, say "N".
 	  If in doubt, say "N".
+
+config DRM_I915_LOW_LEVEL_TRACEPOINTS
+        bool "Enable low level request tracing events"
+        depends on DRM_I915
+        default n
+        help
+          Choose this option to turn on low level request tracing events.
+          This provides the ability to precisely monitor engine utilisation
+          and also analyze the request dependency resolving timeline.
+
+          If in doubt, say "N".

+ 2 - 0
drivers/gpu/drm/i915/i915_gem_request.c

@@ -426,6 +426,7 @@ void __i915_gem_request_submit(struct drm_i915_gem_request *request)
 	spin_unlock(&request->timeline->lock);
 	spin_unlock(&request->timeline->lock);
 
 
 	i915_sw_fence_commit(&request->execute);
 	i915_sw_fence_commit(&request->execute);
+	trace_i915_gem_request_execute(request);
 }
 }
 
 
 void i915_gem_request_submit(struct drm_i915_gem_request *request)
 void i915_gem_request_submit(struct drm_i915_gem_request *request)
@@ -449,6 +450,7 @@ submit_notify(struct i915_sw_fence *fence, enum i915_sw_fence_notify state)
 
 
 	switch (state) {
 	switch (state) {
 	case FENCE_COMPLETE:
 	case FENCE_COMPLETE:
+		trace_i915_gem_request_submit(request);
 		request->engine->submit_request(request);
 		request->engine->submit_request(request);
 		break;
 		break;
 
 

+ 24 - 0
drivers/gpu/drm/i915/i915_trace.h

@@ -477,6 +477,30 @@ DEFINE_EVENT(i915_gem_request, i915_gem_request_add,
 	    TP_ARGS(req)
 	    TP_ARGS(req)
 );
 );
 
 
+#if defined(CONFIG_DRM_I915_LOW_LEVEL_TRACEPOINTS)
+DEFINE_EVENT(i915_gem_request, i915_gem_request_submit,
+	     TP_PROTO(struct drm_i915_gem_request *req),
+	     TP_ARGS(req)
+);
+
+DEFINE_EVENT(i915_gem_request, i915_gem_request_execute,
+	     TP_PROTO(struct drm_i915_gem_request *req),
+	     TP_ARGS(req)
+);
+#else
+#if !defined(TRACE_HEADER_MULTI_READ)
+static inline void
+trace_i915_gem_request_submit(struct drm_i915_gem_request *req)
+{
+}
+
+static inline void
+trace_i915_gem_request_execute(struct drm_i915_gem_request *req)
+{
+}
+#endif
+#endif
+
 TRACE_EVENT(i915_gem_request_notify,
 TRACE_EVENT(i915_gem_request_notify,
 	    TP_PROTO(struct intel_engine_cs *engine),
 	    TP_PROTO(struct intel_engine_cs *engine),
 	    TP_ARGS(engine),
 	    TP_ARGS(engine),