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

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

drm/amdgpu: add more warning to amdgpu_bo_offset 



Warn when we try to get the address and the BO isn't locked or reserved.

Signed-off-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 78bbbd9c

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

+18 −0
Original line number Diff line number Diff line
@@ -737,3 +737,21 @@ void amdgpu_bo_fence(struct amdgpu_bo *bo, struct fence *fence, 
	else

		reservation_object_add_excl_fence(resv, fence);

}



/**

 * amdgpu_bo_gpu_offset - return GPU offset of bo

 * @bo:	amdgpu object for which we query the offset

 *

 * Returns current GPU offset of the object.

 *

 * Note: object should either be pinned or reserved when calling this

 * function, it might be useful to add check for this for debugging.

 */

u64 amdgpu_bo_gpu_offset(struct amdgpu_bo *bo)

{

	WARN_ON_ONCE(bo->tbo.mem.mem_type == TTM_PL_SYSTEM);

	WARN_ON_ONCE(!ww_mutex_is_locked(&bo->tbo.resv->lock) &&

		     !bo->pin_count);



	return bo->tbo.offset;

}

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

+1 −15
Original line number Diff line number Diff line
@@ -85,21 +85,6 @@ static inline void amdgpu_bo_unreserve(struct amdgpu_bo *bo) 
	ttm_bo_unreserve(&bo->tbo);

}



/**

 * amdgpu_bo_gpu_offset - return GPU offset of bo

 * @bo:	amdgpu object for which we query the offset

 *

 * Returns current GPU offset of the object.

 *

 * Note: object should either be pinned or reserved when calling this

 * function, it might be useful to add check for this for debugging.

 */

static inline u64 amdgpu_bo_gpu_offset(struct amdgpu_bo *bo)

{

	WARN_ON_ONCE(bo->tbo.mem.mem_type == TTM_PL_SYSTEM);

	return bo->tbo.offset;

}



static inline unsigned long amdgpu_bo_size(struct amdgpu_bo *bo)

{

	return bo->tbo.num_pages << PAGE_SHIFT;
@@ -169,6 +154,7 @@ void amdgpu_bo_move_notify(struct ttm_buffer_object *bo, 
int amdgpu_bo_fault_reserve_notify(struct ttm_buffer_object *bo);

void amdgpu_bo_fence(struct amdgpu_bo *bo, struct fence *fence,

		     bool shared);

u64 amdgpu_bo_gpu_offset(struct amdgpu_bo *bo);



/*

 * sub allocation