Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f6fd2030 authored by Andres Rodriguez's avatar Andres Rodriguez Committed by Alex Deucher
Browse files

drm/amdgpu: use sched_job id instead of pointer for tracing 



Pointers get reallocated and they are hard to read for humans. Use ids
instead.

Reviewed-by: default avatarChunming Zhou <david1.zhou@amd.com>
Reviewed-by: default avatarChristian König <christian.koenig@amd.com>
Signed-off-by: default avatarAndres Rodriguez <andresx7@gmail.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 373eadfa

drivers/gpu/drm/amd/amdgpu/amdgpu_trace.h

+8 −8
Original line number Diff line number Diff line
@@ -102,7 +102,7 @@ TRACE_EVENT(amdgpu_cs_ioctl, 
	    TP_ARGS(job),

	    TP_STRUCT__entry(

			     __field(struct amdgpu_device *, adev)

			     __field(struct amd_sched_job *, sched_job)

			     __field(uint64_t, sched_job_id)

			     __field(struct amdgpu_ib *, ib)

			     __field(struct dma_fence *, fence)

			     __field(char *, ring_name)
@@ -111,14 +111,14 @@ TRACE_EVENT(amdgpu_cs_ioctl, 


	    TP_fast_assign(

			   __entry->adev = job->adev;

			   __entry->sched_job = &job->base;

			   __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=%p, first_ib=%p, sched_fence=%p, ring_name=%s, num_ibs=%u",

		      __entry->adev, __entry->sched_job, __entry->ib,

	    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,

		      __entry->fence, __entry->ring_name, __entry->num_ibs)

);
@@ -127,7 +127,7 @@ TRACE_EVENT(amdgpu_sched_run_job, 
	    TP_ARGS(job),

	    TP_STRUCT__entry(

			     __field(struct amdgpu_device *, adev)

			     __field(struct amd_sched_job *, sched_job)

			     __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))
@@ -139,7 +139,7 @@ TRACE_EVENT(amdgpu_sched_run_job, 


	    TP_fast_assign(

			   __entry->adev = job->adev;

			   __entry->sched_job = &job->base;

			   __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))
@@ -148,8 +148,8 @@ TRACE_EVENT(amdgpu_sched_run_job, 
			   __entry->ring_name = job->ring->name;

			   __entry->num_ibs = job->num_ibs;

			   ),

	    TP_printk("adev=%p, sched_job=%p, first_ib=%p, sched_fence=%p, timeline=%s, context=%u, seqno=%u, ring_name=%s, num_ibs=%u",

		      __entry->adev, __entry->sched_job, __entry->ib,

	    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)

);