[RFC v3 05/10] drm/amdgpu: Use dma-fence driver and timeline name helpers

[Christian König]

On 5/13/25 09:45, Tvrtko Ursulin wrote:
> Access the dma-fence internals via the previously added helpers.
> 
> Drop the macro while at it, since the length is now more manageable.
> 
> Signed-off-by: Tvrtko Ursulin <tvrtko.ursulin at igalia.com>

Reviewed-by: Christian König <christian.koenig at amd.com>

> ---
>  drivers/gpu/drm/amd/amdgpu/amdgpu_trace.h | 9 ++-------
>  1 file changed, 2 insertions(+), 7 deletions(-)
> 
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_trace.h b/drivers/gpu/drm/amd/amdgpu/amdgpu_trace.h
> index 11dd2e0f7979..4c61e4168f23 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_trace.h
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_trace.h
> @@ -32,9 +32,6 @@
>  #define TRACE_SYSTEM amdgpu
>  #define TRACE_INCLUDE_FILE amdgpu_trace
>  
> -#define AMDGPU_JOB_GET_TIMELINE_NAME(job) \
> -	 job->base.s_fence->finished.ops->get_timeline_name(&job->base.s_fence->finished)
> -
>  TRACE_EVENT(amdgpu_device_rreg,
>  	    TP_PROTO(unsigned did, uint32_t reg, uint32_t value),
>  	    TP_ARGS(did, reg, value),
> @@ -168,7 +165,7 @@ TRACE_EVENT(amdgpu_cs_ioctl,
>  	    TP_ARGS(job),
>  	    TP_STRUCT__entry(
>  			     __field(uint64_t, sched_job_id)
> -			     __string(timeline, AMDGPU_JOB_GET_TIMELINE_NAME(job))
> +			     __string(timeline, dma_fence_timeline_name(&job->base.s_fence->finished))
>  			     __field(unsigned int, context)
>  			     __field(unsigned int, seqno)
>  			     __field(struct dma_fence *, fence)
> @@ -194,7 +191,7 @@ TRACE_EVENT(amdgpu_sched_run_job,
>  	    TP_ARGS(job),
>  	    TP_STRUCT__entry(
>  			     __field(uint64_t, sched_job_id)
> -			     __string(timeline, AMDGPU_JOB_GET_TIMELINE_NAME(job))
> +			     __string(timeline, dma_fence_timeline_name(&job->base.s_fence->finished))
>  			     __field(unsigned int, context)
>  			     __field(unsigned int, seqno)
>  			     __string(ring, to_amdgpu_ring(job->base.sched)->name)
> @@ -585,8 +582,6 @@ TRACE_EVENT(amdgpu_reset_reg_dumps,
>  		      __entry->address,
>  		      __entry->value)
>  );
> -
> -#undef AMDGPU_JOB_GET_TIMELINE_NAME
>  #endif
>  
>  /* This part must be outside protection */