From 2359419fa5dbb5e6afe1d16994c77dd52ecc8e25 Mon Sep 17 00:00:00 2001 From: Andres Rodriguez Date: Thu, 9 Mar 2017 21:25:53 -0500 Subject: [PATCH] drm/amdgpu: remove useless pointers from traces MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Remove pointers which provide redundant information which is already easier to deduce from other fields. Reviewed-by: Chunming Zhou Reviewed-by: Christian König Signed-off-by: Andres Rodriguez Signed-off-by: Alex Deucher --- drivers/gpu/drm/amd/amdgpu/amdgpu_trace.h | 21 +++++---------------- 1 file changed, 5 insertions(+), 16 deletions(-) diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_trace.h b/drivers/gpu/drm/amd/amdgpu/amdgpu_trace.h index 042a091cc42d..39529a1d3b21 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_trace.h +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_trace.h @@ -101,24 +101,20 @@ TRACE_EVENT(amdgpu_cs_ioctl, TP_PROTO(struct amdgpu_job *job), TP_ARGS(job), TP_STRUCT__entry( - __field(struct amdgpu_device *, adev) __field(uint64_t, sched_job_id) - __field(struct amdgpu_ib *, ib) __field(struct dma_fence *, fence) __field(char *, ring_name) __field(u32, num_ibs) ), TP_fast_assign( - __entry->adev = job->adev; __entry->sched_job_id = job->base.id; - __entry->ib = job->ibs; __entry->fence = &job->base.s_fence->finished; __entry->ring_name = job->ring->name; __entry->num_ibs = job->num_ibs; ), - TP_printk("adev=%p, sched_job=%llu, first_ib=%p, sched_fence=%p, ring_name=%s, num_ibs=%u", - __entry->adev, __entry->sched_job_id, __entry->ib, + TP_printk("sched_job=%llu, sched_fence=%p, ring_name=%s, num_ibs=%u", + __entry->sched_job_id, __entry->fence, __entry->ring_name, __entry->num_ibs) ); @@ -126,10 +122,7 @@ TRACE_EVENT(amdgpu_sched_run_job, TP_PROTO(struct amdgpu_job *job), TP_ARGS(job), TP_STRUCT__entry( - __field(struct amdgpu_device *, adev) __field(uint64_t, sched_job_id) - __field(struct amdgpu_ib *, ib) - __field(struct dma_fence *, fence) __string(timeline, job->base.s_fence->finished.ops->get_timeline_name(&job->base.s_fence->finished)) __field(unsigned int, context) __field(unsigned int, seqno) @@ -138,20 +131,16 @@ TRACE_EVENT(amdgpu_sched_run_job, ), TP_fast_assign( - __entry->adev = job->adev; __entry->sched_job_id = job->base.id; - __entry->ib = job->ibs; - __entry->fence = &job->base.s_fence->finished; __assign_str(timeline, job->base.s_fence->finished.ops->get_timeline_name(&job->base.s_fence->finished)) __entry->context = job->base.s_fence->finished.context; __entry->seqno = job->base.s_fence->finished.seqno; __entry->ring_name = job->ring->name; __entry->num_ibs = job->num_ibs; ), - TP_printk("adev=%p, sched_job=%llu, first_ib=%p, sched_fence=%p, timeline=%s, context=%u, seqno=%u, ring_name=%s, num_ibs=%u", - __entry->adev, __entry->sched_job_id, __entry->ib, - __entry->fence, __get_str(timeline), __entry->context, __entry->seqno, - __entry->ring_name, __entry->num_ibs) + TP_printk("sched_job=%llu, timeline=%s, context=%u, seqno=%u, ring_name=%s, num_ibs=%u", + __entry->sched_job_id, __get_str(timeline), __entry->context, + __entry->seqno, __entry->ring_name, __entry->num_ibs) );