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

Commit 15da301d authored by David Mao's avatar David Mao Committed by Alex Deucher
Browse files

drm/amd/amdgpu : adding new tracepoints to track memory information. 



 - adding amdgpu_cs_bo_status to track total size and
   total entry count of bo for each submission.
 - adding amdgpu_ttm_bo_move to track the bo eviction
   including the size of bo and the location before/after the move

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

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

+3 −0
Original line number Diff line number Diff line
@@ -94,6 +94,7 @@ static int amdgpu_bo_list_set(struct amdgpu_device *adev, 
	unsigned last_entry = 0, first_userptr = num_entries;

	unsigned i;

	int r;

	unsigned long total_size = 0;



	array = drm_malloc_ab(num_entries, sizeof(struct amdgpu_bo_list_entry));

	if (!array)
@@ -140,6 +141,7 @@ static int amdgpu_bo_list_set(struct amdgpu_device *adev, 
		if (entry->robj->prefered_domains == AMDGPU_GEM_DOMAIN_OA)

			oa_obj = entry->robj;



		total_size += amdgpu_bo_size(entry->robj);

		trace_amdgpu_bo_list_set(list, entry->robj);

	}
@@ -155,6 +157,7 @@ static int amdgpu_bo_list_set(struct amdgpu_device *adev, 
	list->array = array;

	list->num_entries = num_entries;



	trace_amdgpu_cs_bo_status(list->num_entries, total_size);

	return 0;



error_free:

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

+3 −0
Original line number Diff line number Diff line
@@ -589,6 +589,7 @@ void amdgpu_bo_move_notify(struct ttm_buffer_object *bo, 
			   struct ttm_mem_reg *new_mem)

{

	struct amdgpu_bo *rbo;

	struct ttm_mem_reg *old_mem = &bo->mem;



	if (!amdgpu_ttm_bo_is_amdgpu_bo(bo))

		return;
@@ -602,6 +603,8 @@ void amdgpu_bo_move_notify(struct ttm_buffer_object *bo, 


	/* move_notify is called before move happens */

	amdgpu_update_memory_usage(rbo->adev, &bo->mem, new_mem);



	trace_amdgpu_ttm_bo_move(rbo, new_mem->mem_type, old_mem->mem_type);

}



int amdgpu_bo_fault_reserve_notify(struct ttm_buffer_object *bo)

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

+37 −0
Original line number Diff line number Diff line
@@ -307,6 +307,43 @@ TRACE_EVENT(amdgpu_bo_list_set, 
		      __entry->bo_size)

);



TRACE_EVENT(amdgpu_cs_bo_status,

	    TP_PROTO(uint64_t total_bo, uint64_t total_size),

	    TP_ARGS(total_bo, total_size),

	    TP_STRUCT__entry(

			__field(u64, total_bo)

			__field(u64, total_size)

			),



	    TP_fast_assign(

			__entry->total_bo = total_bo;

			__entry->total_size = total_size;

			),

	    TP_printk("total bo size = %Ld, total bo count = %Ld",

			__entry->total_bo, __entry->total_size)

);



TRACE_EVENT(amdgpu_ttm_bo_move,

	    TP_PROTO(struct amdgpu_bo* bo, uint32_t new_placement, uint32_t old_placement),

	    TP_ARGS(bo, new_placement, old_placement),

	    TP_STRUCT__entry(

			__field(struct amdgpu_bo *, bo)

			__field(u64, bo_size)

			__field(u32, new_placement)

			__field(u32, old_placement)

			),



	    TP_fast_assign(

			__entry->bo      = bo;

			__entry->bo_size = amdgpu_bo_size(bo);

			__entry->new_placement = new_placement;

			__entry->old_placement = old_placement;

			),

	    TP_printk("bo=%p from:%d to %d with size = %Ld",

			__entry->bo, __entry->old_placement,

			__entry->new_placement, __entry->bo_size)

);



#endif



/* This part must be outside protection */