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

drm/amdgpu: add some lockdep checks to the VM code 



Whenever a bo_va structure is added or removed the VM and eventually
added BO should be locked.

Signed-off-by: default avatarChristian König <christian.koenig@amd.com>
Reviewed-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Reviewed-by: default avatarFelix Kuehling <Felix.Kuehling@amd.com>
Acked-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 7e2ec174

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

+6 −0
Original line number Diff line number Diff line
@@ -2244,6 +2244,8 @@ struct amdgpu_bo_va *amdgpu_vm_bo_add(struct amdgpu_device *adev, 
{

	struct amdgpu_bo_va *bo_va;



	dma_resv_assert_held(vm->root.bo->tbo.base.resv);



	bo_va = kzalloc(sizeof(struct amdgpu_bo_va), GFP_KERNEL);

	if (bo_va == NULL) {

		return NULL;
@@ -2257,6 +2259,7 @@ struct amdgpu_bo_va *amdgpu_vm_bo_add(struct amdgpu_device *adev, 
	if (!bo)

		return bo_va;



	dma_resv_assert_held(bo->tbo.base.resv);

	if (amdgpu_dmabuf_is_xgmi_accessible(adev, bo)) {

		bo_va->is_xgmi = true;

		/* Power up XGMI if it can be potentially used */
@@ -2651,7 +2654,10 @@ void amdgpu_vm_bo_rmv(struct amdgpu_device *adev, 
	struct amdgpu_vm *vm = bo_va->base.vm;

	struct amdgpu_vm_bo_base **base;



	dma_resv_assert_held(vm->root.bo->tbo.base.resv);



	if (bo) {

		dma_resv_assert_held(bo->tbo.base.resv);

		if (bo->tbo.base.resv == vm->root.bo->tbo.base.resv)

			vm->bulk_moveable = false;