Commit 8ae58087 authored by Christian König's avatar Christian König Committed by Zheng Zengkai
Browse files

drm/amdgpu: fix error handling in amdgpu_vm_init 

stable inclusion
from stable-v6.6.3
commit 5e94f18d5e93bd7c352e6bb7c04fbe3c4f44a6d6
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/I8LBQP

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=5e94f18d5e93bd7c352e6bb7c04fbe3c4f44a6d6



--------------------------------

commit 8473bfdcb5b1a32fd05629c4535ccacd73bc5567 upstream.

When clearing the root PD fails we need to properly release it again.

Signed-off-by: default avatarChristian König <christian.koenig@amd.com>
Acked-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Cc: stable@vger.kernel.org
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: default avatarZheng Zengkai <zhengzengkai@huawei.com>
parent c57ab325

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

+16 −15
Original line number Diff line number Diff line
@@ -2125,7 +2125,8 @@ long amdgpu_vm_wait_idle(struct amdgpu_vm *vm, long timeout) 
 * Returns:

 * 0 for success, error for failure.

 */

int amdgpu_vm_init(struct amdgpu_device *adev, struct amdgpu_vm *vm, int32_t xcp_id)

int amdgpu_vm_init(struct amdgpu_device *adev, struct amdgpu_vm *vm,

		   int32_t xcp_id)

{

	struct amdgpu_bo *root_bo;

	struct amdgpu_bo_vm *root;
@@ -2144,6 +2145,7 @@ int amdgpu_vm_init(struct amdgpu_device *adev, struct amdgpu_vm *vm, int32_t xcp 
	INIT_LIST_HEAD(&vm->done);

	INIT_LIST_HEAD(&vm->pt_freed);

	INIT_WORK(&vm->pt_free_work, amdgpu_vm_pt_free_work);

	INIT_KFIFO(vm->faults);



	r = amdgpu_vm_init_entities(adev, vm);

	if (r)
@@ -2178,34 +2180,33 @@ int amdgpu_vm_init(struct amdgpu_device *adev, struct amdgpu_vm *vm, int32_t xcp 
				false, &root, xcp_id);

	if (r)

		goto error_free_delayed;

	root_bo = &root->bo;



	root_bo = amdgpu_bo_ref(&root->bo);

	r = amdgpu_bo_reserve(root_bo, true);

	if (r)

		goto error_free_root;

	if (r) {

		amdgpu_bo_unref(&root->shadow);

		amdgpu_bo_unref(&root_bo);

		goto error_free_delayed;

	}



	amdgpu_vm_bo_base_init(&vm->root, vm, root_bo);

	r = dma_resv_reserve_fences(root_bo->tbo.base.resv, 1);

	if (r)

		goto error_unreserve;



	amdgpu_vm_bo_base_init(&vm->root, vm, root_bo);

		goto error_free_root;



	r = amdgpu_vm_pt_clear(adev, vm, root, false);

	if (r)

		goto error_unreserve;

		goto error_free_root;



	amdgpu_bo_unreserve(vm->root.bo);



	INIT_KFIFO(vm->faults);

	amdgpu_bo_unref(&root_bo);



	return 0;



error_unreserve:

	amdgpu_bo_unreserve(vm->root.bo);



error_free_root:

	amdgpu_bo_unref(&root->shadow);

	amdgpu_vm_pt_free_root(adev, vm);

	amdgpu_bo_unreserve(vm->root.bo);

	amdgpu_bo_unref(&root_bo);

	vm->root.bo = NULL;



error_free_delayed:

	dma_fence_put(vm->last_tlb_flush);