drm/sched: use DECLARE_EVENT_CLASS

drm_sched_job and drm_run_job have the same prototype.

v2: rename the class from drm_sched_job_entity to drm_sched_job (Andrey)

Signed-off-by: Chia-I Wu <olvaffe@gmail.com>
Cc: Rob Clark <robdclark@chromium.org>
Reviewed-by: Andrey Grodzovsky <andrey.grodzovsky@amd.com>
Signed-off-by: Andrey Grodzovsky <andrey.grodzovsky@amd.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20220412204809.824491-1-olvaffe@gmail.com

diff --git a/drivers/gpu/drm/scheduler/gpu_scheduler_trace.h b/drivers/gpu/drm/scheduler/gpu_scheduler_trace.h
index 877ce9b127f16b3f495078f5eabac95deb592485..188ae2105d57b8a3ef1e6eb25161809b749f846b 100644 (file)
--- a/drivers/gpu/drm/scheduler/gpu_scheduler_trace.h
+++ b/drivers/gpu/drm/scheduler/gpu_scheduler_trace.h
@@ -32,7 +32,7 @@
 #define TRACE_SYSTEM gpu_scheduler
 #define TRACE_INCLUDE_FILE gpu_scheduler_trace
 
-TRACE_EVENT(drm_sched_job,
+DECLARE_EVENT_CLASS(drm_sched_job,
            TP_PROTO(struct drm_sched_job *sched_job, struct drm_sched_entity *entity),
            TP_ARGS(sched_job, entity),
            TP_STRUCT__entry(
@@ -59,31 +59,14 @@ TRACE_EVENT(drm_sched_job,
                      __entry->job_count, __entry->hw_job_count)
 );
 
-TRACE_EVENT(drm_run_job,
+DEFINE_EVENT(drm_sched_job, drm_sched_job,
            TP_PROTO(struct drm_sched_job *sched_job, struct drm_sched_entity *entity),
-           TP_ARGS(sched_job, entity),
-           TP_STRUCT__entry(
-                            __field(struct drm_sched_entity *, entity)
-                            __field(struct dma_fence *, fence)
-                            __field(const char *, name)
-                            __field(uint64_t, id)
-                            __field(u32, job_count)
-                            __field(int, hw_job_count)
-                            ),
+           TP_ARGS(sched_job, entity)
+);
 
-           TP_fast_assign(
-                          __entry->entity = entity;
-                          __entry->id = sched_job->id;
-                          __entry->fence = &sched_job->s_fence->finished;
-                          __entry->name = sched_job->sched->name;
-                          __entry->job_count = spsc_queue_count(&entity->job_queue);
-                          __entry->hw_job_count = atomic_read(
-                                  &sched_job->sched->hw_rq_count);
-                          ),
-           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)
+DEFINE_EVENT(drm_sched_job, drm_run_job,
+           TP_PROTO(struct drm_sched_job *sched_job, struct drm_sched_entity *entity),
+           TP_ARGS(sched_job, entity)
 );
 
 TRACE_EVENT(drm_sched_process_job,