[PATCH v2 16/22] drm/xe: Add exec queue deadline trace points

[Matthew Brost <matthew.brost@intel.com>]

Add exec queue deadline trace points to help debug and profile the
deadline implementation.

v2:
 - Add freq / prio tracepoints

Signed-off-by: Matthew Brost <matthew.brost@intel.com>
---
 drivers/gpu/drm/xe/xe_deadline_mgr.c |  4 +++-
 drivers/gpu/drm/xe/xe_guc_submit.c   | 10 +++++++---
 drivers/gpu/drm/xe/xe_trace.h        | 20 ++++++++++++++++++++
 3 files changed, 30 insertions(+), 4 deletions(-)

diff --git a/drivers/gpu/drm/xe/xe_deadline_mgr.c b/drivers/gpu/drm/xe/xe_deadline_mgr.c
index 8ebecf92aa8c..f3c920017e40 100644
--- a/drivers/gpu/drm/xe/xe_deadline_mgr.c
+++ b/drivers/gpu/drm/xe/xe_deadline_mgr.c
@@ -69,8 +69,10 @@ static bool __xe_deadline_mgr_enter_deadline(struct xe_deadline_mgr *mgr,
 	lockdep_assert_held(&mgr->lock);
 
 	if (XE_DEADLINE_EXIT_DELAY_MS &&
-	    mgr->state != XE_DEADLINE_MGR_STATE_NO_BOOST)
+	    mgr->state != XE_DEADLINE_MGR_STATE_NO_BOOST) {
 		cancel_delayed_work(&mgr->exit_delay);
+		trace_xe_exec_queue_cancel_deadline_exit(mgr->q);
+	}
 
 	if (mgr->state != state && !__xe_deadline_mgr_deadline_signaled(mgr)) {
 		mgr->state = state;
diff --git a/drivers/gpu/drm/xe/xe_guc_submit.c b/drivers/gpu/drm/xe/xe_guc_submit.c
index 1aca444faf8b..7e47c375f530 100644
--- a/drivers/gpu/drm/xe/xe_guc_submit.c
+++ b/drivers/gpu/drm/xe/xe_guc_submit.c
@@ -2088,12 +2088,16 @@ __guc_exec_queue_process_msg_set_deadline_state(struct xe_sched_msg *msg,
 	struct xe_guc *guc = exec_queue_to_guc(q);
 	enum xe_deadline_mgr_state state;
 
-	if (opcode == EXIT_DEADLINE)
+	if (opcode == EXIT_DEADLINE) {
 		state = XE_DEADLINE_MGR_STATE_NO_BOOST;
-	else if (opcode == ENTER_DEADLINE_FREQ)
+		trace_xe_exec_queue_exit_deadline(q);
+	} else if (opcode == ENTER_DEADLINE_FREQ) {
 		state = XE_DEADLINE_MGR_STATE_FREQ_BOOST;
-	else
+		trace_xe_exec_queue_enter_deadline_freq(q);
+	} else {
 		state = XE_DEADLINE_MGR_STATE_PRIO_BOOST;
+		trace_xe_exec_queue_enter_deadline_prio(q);
+	}
 
 	if (guc_exec_queue_allowed_to_change_state(q))
 		deadline_policies(guc, q, state);
diff --git a/drivers/gpu/drm/xe/xe_trace.h b/drivers/gpu/drm/xe/xe_trace.h
index 6d12fcc13f43..14592403d2c0 100644
--- a/drivers/gpu/drm/xe/xe_trace.h
+++ b/drivers/gpu/drm/xe/xe_trace.h
@@ -233,6 +233,26 @@ DEFINE_EVENT(xe_exec_queue, xe_exec_queue_lr_cleanup,
 	     TP_ARGS(q)
 );
 
+DEFINE_EVENT(xe_exec_queue, xe_exec_queue_enter_deadline_freq,
+	     TP_PROTO(struct xe_exec_queue *q),
+	     TP_ARGS(q)
+);
+
+DEFINE_EVENT(xe_exec_queue, xe_exec_queue_enter_deadline_prio,
+	     TP_PROTO(struct xe_exec_queue *q),
+	     TP_ARGS(q)
+);
+
+DEFINE_EVENT(xe_exec_queue, xe_exec_queue_exit_deadline,
+	     TP_PROTO(struct xe_exec_queue *q),
+	     TP_ARGS(q)
+);
+
+DEFINE_EVENT(xe_exec_queue, xe_exec_queue_cancel_deadline_exit,
+	     TP_PROTO(struct xe_exec_queue *q),
+	     TP_ARGS(q)
+);
+
 DECLARE_EVENT_CLASS(xe_sched_job,
 		    TP_PROTO(struct xe_sched_job *job),
 		    TP_ARGS(job),
-- 
2.34.1