diff options
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/amdgpu_trace.h')
| -rw-r--r-- | drivers/gpu/drm/amd/amdgpu/amdgpu_trace.h | 94 | 
1 files changed, 51 insertions, 43 deletions
| diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_trace.h b/drivers/gpu/drm/amd/amdgpu/amdgpu_trace.h index 76ecbaf72a2e..8f9834ab1bd5 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_trace.h +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_trace.h @@ -48,6 +48,57 @@ TRACE_EVENT(amdgpu_cs,  		      __entry->fences)  ); +TRACE_EVENT(amdgpu_cs_ioctl, +	    TP_PROTO(struct amdgpu_job *job), +	    TP_ARGS(job), +	    TP_STRUCT__entry( +			     __field(struct amdgpu_device *, adev) +			     __field(struct amd_sched_job *, sched_job) +			     __field(struct amdgpu_ib *, ib) +			     __field(struct fence *, fence) +			     __field(char *, ring_name) +			     __field(u32, num_ibs) +			     ), + +	    TP_fast_assign( +			   __entry->adev = job->adev; +			   __entry->sched_job = &job->base; +			   __entry->ib = job->ibs; +			   __entry->fence = &job->base.s_fence->base; +			   __entry->ring_name = job->ibs[0].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, +		      __entry->fence, __entry->ring_name, __entry->num_ibs) +); + +TRACE_EVENT(amdgpu_sched_run_job, +	    TP_PROTO(struct amdgpu_job *job), +	    TP_ARGS(job), +	    TP_STRUCT__entry( +			     __field(struct amdgpu_device *, adev) +			     __field(struct amd_sched_job *, sched_job) +			     __field(struct amdgpu_ib *, ib) +			     __field(struct fence *, fence) +			     __field(char *, ring_name) +			     __field(u32, num_ibs) +			     ), + +	    TP_fast_assign( +			   __entry->adev = job->adev; +			   __entry->sched_job = &job->base; +			   __entry->ib = job->ibs; +			   __entry->fence = &job->base.s_fence->base; +			   __entry->ring_name = job->ibs[0].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, +		      __entry->fence, __entry->ring_name, __entry->num_ibs) +); + +  TRACE_EVENT(amdgpu_vm_grab_id,  	    TP_PROTO(unsigned vmid, int ring),  	    TP_ARGS(vmid, ring), @@ -196,49 +247,6 @@ TRACE_EVENT(amdgpu_bo_list_set,  	    TP_printk("list=%p, bo=%p", __entry->list, __entry->bo)  ); -DECLARE_EVENT_CLASS(amdgpu_fence_request, - -	    TP_PROTO(struct drm_device *dev, int ring, u32 seqno), - -	    TP_ARGS(dev, ring, seqno), - -	    TP_STRUCT__entry( -			     __field(u32, dev) -			     __field(int, ring) -			     __field(u32, seqno) -			     ), - -	    TP_fast_assign( -			   __entry->dev = dev->primary->index; -			   __entry->ring = ring; -			   __entry->seqno = seqno; -			   ), - -	    TP_printk("dev=%u, ring=%d, seqno=%u", -		      __entry->dev, __entry->ring, __entry->seqno) -); - -DEFINE_EVENT(amdgpu_fence_request, amdgpu_fence_emit, - -	    TP_PROTO(struct drm_device *dev, int ring, u32 seqno), - -	    TP_ARGS(dev, ring, seqno) -); - -DEFINE_EVENT(amdgpu_fence_request, amdgpu_fence_wait_begin, - -	    TP_PROTO(struct drm_device *dev, int ring, u32 seqno), - -	    TP_ARGS(dev, ring, seqno) -); - -DEFINE_EVENT(amdgpu_fence_request, amdgpu_fence_wait_end, - -	    TP_PROTO(struct drm_device *dev, int ring, u32 seqno), - -	    TP_ARGS(dev, ring, seqno) -); -  DECLARE_EVENT_CLASS(amdgpu_semaphore_request,  	    TP_PROTO(int ring, struct amdgpu_semaphore *sem), |