Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f2742e47 authored by Tvrtko Ursulin's avatar Tvrtko Ursulin
Browse files

drm/i915: Include priority and completed status in request in/out tracepoints 



It is useful to see the priority as requests are coming in and completed
status as requests are coming out of the GPU.

To achieve this in a more readable way we need to abandon the common
request_hw tracepoint class.

Signed-off-by: default avatarTvrtko Ursulin <tvrtko.ursulin@intel.com>
Reviewed-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Link: https://patchwork.freedesktop.org/patch/msgid/20180504115643.22437-1-tvrtko.ursulin@linux.intel.com
parent 43c8c441

drivers/gpu/drm/i915/i915_trace.h

+58 −35
Original line number Diff line number Diff line
@@ -679,7 +679,7 @@ DEFINE_EVENT(i915_request, i915_request_execute, 
	     TP_ARGS(rq)

);



DECLARE_EVENT_CLASS(i915_request_hw,

TRACE_EVENT(i915_request_in,

	    TP_PROTO(struct i915_request *rq, unsigned int port),

	    TP_ARGS(rq, port),
@@ -691,6 +691,7 @@ DECLARE_EVENT_CLASS(i915_request_hw, 
			     __field(u32, seqno)

			     __field(u32, global_seqno)

			     __field(u32, port)

			     __field(u32, prio)

			    ),



	    TP_fast_assign(
@@ -700,24 +701,46 @@ DECLARE_EVENT_CLASS(i915_request_hw, 
			   __entry->ctx = rq->fence.context;

			   __entry->seqno = rq->fence.seqno;

			   __entry->global_seqno = rq->global_seqno;

			   __entry->prio = rq->sched.attr.priority;

			   __entry->port = port;

			   ),



		    TP_printk("dev=%u, hw_id=%u, ring=%u, ctx=%u, seqno=%u, global=%u, port=%u",

			      __entry->dev, __entry->hw_id, __entry->ring,

			      __entry->ctx, __entry->seqno,

			      __entry->global_seqno, __entry->port)

);



DEFINE_EVENT(i915_request_hw, i915_request_in,

	     TP_PROTO(struct i915_request *rq, unsigned int port),

	     TP_ARGS(rq, port)

	    TP_printk("dev=%u, hw_id=%u, ring=%u, ctx=%u, seqno=%u, prio=%u, global=%u, port=%u",

		      __entry->dev, __entry->hw_id, __entry->ring, __entry->ctx,

		      __entry->seqno, __entry->prio, __entry->global_seqno,

		      __entry->port)

);



DEFINE_EVENT(i915_request, i915_request_out,

TRACE_EVENT(i915_request_out,

	    TP_PROTO(struct i915_request *rq),

	     TP_ARGS(rq)

	    TP_ARGS(rq),



	    TP_STRUCT__entry(

			     __field(u32, dev)

			     __field(u32, hw_id)

			     __field(u32, ring)

			     __field(u32, ctx)

			     __field(u32, seqno)

			     __field(u32, global_seqno)

			     __field(u32, completed)

			    ),



	    TP_fast_assign(

			   __entry->dev = rq->i915->drm.primary->index;

			   __entry->hw_id = rq->ctx->hw_id;

			   __entry->ring = rq->engine->id;

			   __entry->ctx = rq->fence.context;

			   __entry->seqno = rq->fence.seqno;

			   __entry->global_seqno = rq->global_seqno;

			   __entry->completed = i915_request_completed(rq);

			   ),



		    TP_printk("dev=%u, hw_id=%u, ring=%u, ctx=%u, seqno=%u, global=%u, completed?=%u",

			      __entry->dev, __entry->hw_id, __entry->ring,

			      __entry->ctx, __entry->seqno,

			      __entry->global_seqno, __entry->completed)

);



#else

#if !defined(TRACE_HEADER_MULTI_READ)

static inline void