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

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

drm/amdgpu: trace need_flush in grab_vm as well 



Signed-off-by: default avatarChristian König <christian.koenig@amd.com>
Reviewed-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Reviewed-by: default avatarChunming Zhou <david1.zhou@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 2ef004d9

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

+9 −7
Original line number Original line Diff line number Diff line
@@ -149,24 +149,26 @@ TRACE_EVENT(amdgpu_sched_run_job, 








TRACE_EVENT(amdgpu_vm_grab_id,

TRACE_EVENT(amdgpu_vm_grab_id,

	    TP_PROTO(struct amdgpu_vm *vm, int ring, unsigned vmid,

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

		     uint64_t pd_addr),

	    TP_ARGS(vm, ring, job),

	    TP_ARGS(vm, ring, vmid, pd_addr),

	    TP_STRUCT__entry(

	    TP_STRUCT__entry(

			     __field(struct amdgpu_vm *, vm)

			     __field(struct amdgpu_vm *, vm)

			     __field(u32, ring)

			     __field(u32, ring)

			     __field(u32, vmid)

			     __field(u32, vmid)

			     __field(u64, pd_addr)

			     __field(u64, pd_addr)

			     __field(u32, needs_flush)

			     ),

			     ),





	    TP_fast_assign(

	    TP_fast_assign(

			   __entry->vm = vm;

			   __entry->vm = vm;

			   __entry->ring = ring;

			   __entry->ring = ring;

			   __entry->vmid = vmid;

			   __entry->vmid = job->vm_id;

			   __entry->pd_addr = pd_addr;

			   __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", __entry->vm,

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

		      __entry->ring, __entry->vmid, __entry->pd_addr)

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

		      __entry->pd_addr, __entry->needs_flush)

);

);





TRACE_EVENT(amdgpu_vm_bo_map,

TRACE_EVENT(amdgpu_vm_bo_map,

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

+2 −2
Original line number Original line Diff line number Diff line
@@ -297,7 +297,7 @@ int amdgpu_vm_grab_id(struct amdgpu_vm *vm, struct amdgpu_ring *ring, 




		job->vm_id = id - adev->vm_manager.ids;

		job->vm_id = id - adev->vm_manager.ids;

		job->vm_needs_flush = false;

		job->vm_needs_flush = false;

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

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





		mutex_unlock(&adev->vm_manager.lock);

		mutex_unlock(&adev->vm_manager.lock);

		return 0;

		return 0;
@@ -328,7 +328,7 @@ int amdgpu_vm_grab_id(struct amdgpu_vm *vm, struct amdgpu_ring *ring, 
	vm->ids[ring->idx] = id;

	vm->ids[ring->idx] = id;





	job->vm_id = id - adev->vm_manager.ids;

	job->vm_id = id - adev->vm_manager.ids;

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

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





error:

error:

	mutex_unlock(&adev->vm_manager.lock);

	mutex_unlock(&adev->vm_manager.lock);