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

Commit c5296d14 authored by Christian König's avatar Christian König Committed by Alex Deucher
Browse files

drm/amdgpu: trace the vmhub in grab_id as well 



Trace on which VMHUB we assigned an VMID.

Signed-off-by: default avatarChristian König <christian.koenig@amd.com>
Reviewed-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 87c910d8

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

+10 −7
Original line number Diff line number Diff line
@@ -190,26 +190,29 @@ TRACE_EVENT(amdgpu_sched_run_job, 




TRACE_EVENT(amdgpu_vm_grab_id,

	    TP_PROTO(struct amdgpu_vm *vm, int ring, struct amdgpu_job *job),

	    TP_PROTO(struct amdgpu_vm *vm, struct amdgpu_ring *ring,

		     struct amdgpu_job *job),

	    TP_ARGS(vm, ring, job),

	    TP_STRUCT__entry(

			     __field(struct amdgpu_vm *, vm)

			     __field(u32, ring)

			     __field(u32, vmid)

			     __field(u32, vm_id)

			     __field(u32, vm_hub)

			     __field(u64, pd_addr)

			     __field(u32, needs_flush)

			     ),



	    TP_fast_assign(

			   __entry->vm = vm;

			   __entry->ring = ring;

			   __entry->vmid = job->vm_id;

			   __entry->ring = ring->idx;

			   __entry->vm_id = job->vm_id;

			   __entry->vm_hub = ring->funcs->vmhub,

			   __entry->pd_addr = job->vm_pd_addr;

			   __entry->needs_flush = job->vm_needs_flush;

			   ),

	    TP_printk("vm=%p, ring=%u, id=%u, pd_addr=%010Lx needs_flush=%u",

		      __entry->vm, __entry->ring, __entry->vmid,

		      __entry->pd_addr, __entry->needs_flush)

	    TP_printk("vm=%p, ring=%u, id=%u, hub=%u, pd_addr=%010Lx needs_flush=%u",

		      __entry->vm, __entry->ring, __entry->vm_id,

		      __entry->vm_hub, __entry->pd_addr, __entry->needs_flush)

);



TRACE_EVENT(amdgpu_vm_bo_map,

drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c

+1 −1
Original line number Diff line number Diff line
@@ -533,7 +533,7 @@ int amdgpu_vm_grab_id(struct amdgpu_vm *vm, struct amdgpu_ring *ring, 
	list_move_tail(&id->list, &id_mgr->ids_lru);



	job->vm_id = id - id_mgr->ids;

	trace_amdgpu_vm_grab_id(vm, ring->idx, job);

	trace_amdgpu_vm_grab_id(vm, ring, job);



error:

	mutex_unlock(&id_mgr->lock);