Re: [RFC 3/8] drm/i915/tracepoints: Tidy i915_gem_request_wait_begin

Chris Wilson
2017-01-27T12:14:25Z

On Fri, Jan 27, 2017 at 12:01:22PM +0000, Tvrtko Ursulin wrote:
> From: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
>
> Provide the same information as the other request even classes.
>
> Signed-off-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
> ---
> drivers/gpu/drm/i915/i915_trace.h | 12 ++++++++----
> 1 file changed, 8 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/i915_trace.h b/drivers/gpu/drm/i915/i915_trace.h
> index 79162c369812..cbdbe7d6f5ef 100644
> --- a/drivers/gpu/drm/i915/i915_trace.h
> +++ b/drivers/gpu/drm/i915/i915_trace.h
> @@ -619,7 +619,9 @@ TRACE_EVENT(i915_gem_request_wait_begin,
> TP_STRUCT__entry(
> __field(u32, dev)
> __field(u32, ring)
> + __field(u32, ctx)
> __field(u32, seqno)
> + __field(u32, global)
> __field(bool, blocking)
> ),
>
> @@ -632,14 +634,16 @@ TRACE_EVENT(i915_gem_request_wait_begin,
> TP_fast_assign(
> __entry->dev = req->i915->drm.primary->index;
> __entry->ring = req->engine->id;
> - __entry->seqno = req->global_seqno;
> + __entry->ctx = req->ctx->hw_id;
> + __entry->seqno = req->fence.seqno;
> + __entry->global = req->global_seqno;
> __entry->blocking =
> mutex_is_locked(&req->i915->drm.struct_mutex);

We now have accurate information for this field from
(flags & I915_WAIT_LOCKED). Let's fix that up as well and drop the NB.
-Chris

--
Chris Wilson, Intel Open Source Technology Centre