Commit dbf9da8d authored by Matthew Brost's avatar Matthew Brost Committed by John Harrison
Browse files

drm/i915/guc: Add trace point for GuC submit 



Add trace point for GuC submit. Extended existing request trace points
to include submit fence value,, guc_id, and ring tail value.

v2: Fix white space alignment in i915_request_add trace point
v3: Delete dep_from , dep_to (Tvrtko)

Cc: John Harrison <john.c.harrison@intel.com>
Signed-off-by: default avatarMatthew Brost <matthew.brost@intel.com>
Reviewed-by: default avatarJohn Harrison <John.C.Harrison@Intel.com>
Signed-off-by: default avatarJohn Harrison <John.C.Harrison@Intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20210721215101.139794-18-matthew.brost@intel.com
parent 28ff6520

drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c

+3 −0
Original line number Diff line number Diff line
@@ -418,6 +418,7 @@ static int guc_dequeue_one_context(struct intel_guc *guc) 
			guc->stalled_request = last;

			return false;

		}

		trace_i915_request_guc_submit(last);

	}



	guc->stalled_request = NULL;
@@ -638,6 +639,8 @@ static int guc_bypass_tasklet_submit(struct intel_guc *guc, 
	ret = guc_add_request(guc, rq);

	if (ret == -EBUSY)

		guc->stalled_request = rq;

	else

		trace_i915_request_guc_submit(rq);



	return ret;

}

drivers/gpu/drm/i915/i915_trace.h

+19 −4
Original line number Diff line number Diff line
@@ -794,22 +794,27 @@ DECLARE_EVENT_CLASS(i915_request, 
	    TP_STRUCT__entry(

			     __field(u32, dev)

			     __field(u64, ctx)

			     __field(u32, guc_id)

			     __field(u16, class)

			     __field(u16, instance)

			     __field(u32, seqno)

			     __field(u32, tail)

			     ),



	    TP_fast_assign(

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

			   __entry->class = rq->engine->uabi_class;

			   __entry->instance = rq->engine->uabi_instance;

			   __entry->guc_id = rq->context->guc_id;

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

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

			   __entry->tail = rq->tail;

			   ),



	    TP_printk("dev=%u, engine=%u:%u, ctx=%llu, seqno=%u",

	    TP_printk("dev=%u, engine=%u:%u, guc_id=%u, ctx=%llu, seqno=%u, tail=%u",

		      __entry->dev, __entry->class, __entry->instance,

		      __entry->ctx, __entry->seqno)

		      __entry->guc_id, __entry->ctx, __entry->seqno,

		      __entry->tail)

);



DEFINE_EVENT(i915_request, i915_request_add,
@@ -818,6 +823,11 @@ DEFINE_EVENT(i915_request, i915_request_add, 
);



#if defined(CONFIG_DRM_I915_LOW_LEVEL_TRACEPOINTS)

DEFINE_EVENT(i915_request, i915_request_guc_submit,

	     TP_PROTO(struct i915_request *rq),

	     TP_ARGS(rq)

);



DEFINE_EVENT(i915_request, i915_request_submit,

	     TP_PROTO(struct i915_request *rq),

	     TP_ARGS(rq)
@@ -887,6 +897,11 @@ TRACE_EVENT(i915_request_out, 


#else

#if !defined(TRACE_HEADER_MULTI_READ)

static inline void

trace_i915_request_guc_submit(struct i915_request *rq)

{

}



static inline void

trace_i915_request_submit(struct i915_request *rq)

{