Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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

authored by

Chia-I Wu and committed by
Andrey Grodzovsky
4a35c23f febd8fde

+7 -24
+7 -24
drivers/gpu/drm/scheduler/gpu_scheduler_trace.h
··· 32 32 #define TRACE_SYSTEM gpu_scheduler 33 33 #define TRACE_INCLUDE_FILE gpu_scheduler_trace 34 34 35 - TRACE_EVENT(drm_sched_job, 35 + DECLARE_EVENT_CLASS(drm_sched_job, 36 36 TP_PROTO(struct drm_sched_job *sched_job, struct drm_sched_entity *entity), 37 37 TP_ARGS(sched_job, entity), 38 38 TP_STRUCT__entry( ··· 59 59 __entry->job_count, __entry->hw_job_count) 60 60 ); 61 61 62 - TRACE_EVENT(drm_run_job, 62 + DEFINE_EVENT(drm_sched_job, drm_sched_job, 63 63 TP_PROTO(struct drm_sched_job *sched_job, struct drm_sched_entity *entity), 64 - TP_ARGS(sched_job, entity), 65 - TP_STRUCT__entry( 66 - __field(struct drm_sched_entity *, entity) 67 - __field(struct dma_fence *, fence) 68 - __field(const char *, name) 69 - __field(uint64_t, id) 70 - __field(u32, job_count) 71 - __field(int, hw_job_count) 72 - ), 64 + TP_ARGS(sched_job, entity) 65 + ); 73 66 74 - TP_fast_assign( 75 - __entry->entity = entity; 76 - __entry->id = sched_job->id; 77 - __entry->fence = &sched_job->s_fence->finished; 78 - __entry->name = sched_job->sched->name; 79 - __entry->job_count = spsc_queue_count(&entity->job_queue); 80 - __entry->hw_job_count = atomic_read( 81 - &sched_job->sched->hw_rq_count); 82 - ), 83 - TP_printk("entity=%p, id=%llu, fence=%p, ring=%s, job count:%u, hw job count:%d", 84 - __entry->entity, __entry->id, 85 - __entry->fence, __entry->name, 86 - __entry->job_count, __entry->hw_job_count) 67 + DEFINE_EVENT(drm_sched_job, drm_run_job, 68 + TP_PROTO(struct drm_sched_job *sched_job, struct drm_sched_entity *entity), 69 + TP_ARGS(sched_job, entity) 87 70 ); 88 71 89 72 TRACE_EVENT(drm_sched_process_job,