drm/amd/sched: print sched job id in amd_sched_job trace

This makes it easier to correlate amd_sched_job with with other trace
points that don't log the job pointer.

v2: don't print the sched_job pointer (Andres)

Signed-off-by: Nicolai Hähnle <nicolai.haehnle@amd.com>
Reviewed-by: Andres Rodriguez <andresx7@gmail.com>
Reviewed-by: Christian König <christian.koenig@amd.com>

diff --git a/drivers/gpu/drm/amd/scheduler/gpu_sched_trace.h b/drivers/gpu/drm/amd/scheduler/gpu_sched_trace.h
index dbd4fd3a810b71223f1c485dc051515d5da59654..8bd38102b58e25c970a28d2844d0e345c1a06292 100644 (file)
--- a/drivers/gpu/drm/amd/scheduler/gpu_sched_trace.h
+++ b/drivers/gpu/drm/amd/scheduler/gpu_sched_trace.h
@@ -16,16 +16,16 @@ TRACE_EVENT(amd_sched_job,
            TP_ARGS(sched_job),
            TP_STRUCT__entry(
                             __field(struct amd_sched_entity *, entity)
-                            __field(struct amd_sched_job *, sched_job)
                             __field(struct dma_fence *, fence)
                             __field(const char *, name)
+                            __field(uint64_t, id)
                             __field(u32, job_count)
                             __field(int, hw_job_count)
                             ),
 
            TP_fast_assign(
                           __entry->entity = sched_job->s_entity;
-                          __entry->sched_job = sched_job;
+                          __entry->id = sched_job->id;
                           __entry->fence = &sched_job->s_fence->finished;
                           __entry->name = sched_job->sched->name;
                           __entry->job_count = kfifo_len(
@@ -33,8 +33,9 @@ TRACE_EVENT(amd_sched_job,
                           __entry->hw_job_count = atomic_read(
                                   &sched_job->sched->hw_rq_count);
                           ),
-           TP_printk("entity=%p, sched job=%p, fence=%p, ring=%s, job count:%u, hw job count:%d",
-                     __entry->entity, __entry->sched_job, __entry->fence, __entry->name,
+           TP_printk("entity=%p, id=%llu, fence=%p, ring=%s, job count:%u, hw job count:%d",
+                     __entry->entity, __entry->id,
+                     __entry->fence, __entry->name,
                      __entry->job_count, __entry->hw_job_count)
 );