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

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

drm/amdgpu: add BO map/unmap trace point 



Signed-off-by: default avatarChristian König <christian.koenig@amd.com>
Acked-by: default avatarAlex Deucher <aleander.deucher@amd.com>
parent 344c19f9

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

+48 −0
Original line number Diff line number Diff line
@@ -61,6 +61,54 @@ TRACE_EVENT(amdgpu_vm_grab_id, 
	    TP_printk("vmid=%u, ring=%u", __entry->vmid, __entry->ring)

);



TRACE_EVENT(amdgpu_vm_bo_map,

	    TP_PROTO(struct amdgpu_bo_va *bo_va,

		     struct amdgpu_bo_va_mapping *mapping),

	    TP_ARGS(bo_va, mapping),

	    TP_STRUCT__entry(

			     __field(struct amdgpu_bo *, bo)

			     __field(long, start)

			     __field(long, last)

			     __field(u64, offset)

			     __field(u32, flags)

			     ),



	    TP_fast_assign(

			   __entry->bo = bo_va->bo;

			   __entry->start = mapping->it.start;

			   __entry->last = mapping->it.last;

			   __entry->offset = mapping->offset;

			   __entry->flags = mapping->flags;

			   ),

	    TP_printk("bo=%p, start=%lx, last=%lx, offset=%010llx, flags=%08x",

		      __entry->bo, __entry->start, __entry->last,

		      __entry->offset, __entry->flags)

);



TRACE_EVENT(amdgpu_vm_bo_unmap,

	    TP_PROTO(struct amdgpu_bo_va *bo_va,

		     struct amdgpu_bo_va_mapping *mapping),

	    TP_ARGS(bo_va, mapping),

	    TP_STRUCT__entry(

			     __field(struct amdgpu_bo *, bo)

			     __field(long, start)

			     __field(long, last)

			     __field(u64, offset)

			     __field(u32, flags)

			     ),



	    TP_fast_assign(

			   __entry->bo = bo_va->bo;

			   __entry->start = mapping->it.start;

			   __entry->last = mapping->it.last;

			   __entry->offset = mapping->offset;

			   __entry->flags = mapping->flags;

			   ),

	    TP_printk("bo=%p, start=%lx, last=%lx, offset=%010llx, flags=%08x",

		      __entry->bo, __entry->start, __entry->last,

		      __entry->offset, __entry->flags)

);



TRACE_EVENT(amdgpu_vm_bo_update,

	    TP_PROTO(struct amdgpu_bo_va_mapping *mapping),

	    TP_ARGS(mapping),

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

+4 −0
Original line number Diff line number Diff line
@@ -1001,6 +1001,7 @@ int amdgpu_vm_bo_map(struct amdgpu_device *adev, 


	list_add(&mapping->list, &bo_va->mappings);

	interval_tree_insert(&mapping->it, &vm->va);

	trace_amdgpu_vm_bo_map(bo_va, mapping);



	bo_va->addr = 0;
@@ -1058,6 +1059,7 @@ error_free: 
	mutex_lock(&vm->mutex);

	list_del(&mapping->list);

	interval_tree_remove(&mapping->it, &vm->va);

	trace_amdgpu_vm_bo_unmap(bo_va, mapping);

	kfree(mapping);



error_unlock:
@@ -1099,6 +1101,7 @@ int amdgpu_vm_bo_unmap(struct amdgpu_device *adev, 
	mutex_lock(&vm->mutex);

	list_del(&mapping->list);

	interval_tree_remove(&mapping->it, &vm->va);

	trace_amdgpu_vm_bo_unmap(bo_va, mapping);



	if (bo_va->addr) {

		/* clear the old address */
@@ -1139,6 +1142,7 @@ void amdgpu_vm_bo_rmv(struct amdgpu_device *adev, 
	list_for_each_entry_safe(mapping, next, &bo_va->mappings, list) {

		list_del(&mapping->list);

		interval_tree_remove(&mapping->it, &vm->va);

		trace_amdgpu_vm_bo_unmap(bo_va, mapping);

		if (bo_va->addr)

			list_add(&mapping->list, &vm->freed);

		else