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

Commit 99b0ea03 authored by Christian König's avatar Christian König Committed by Greg Kroah-Hartman
Browse files

drm/amdgpu: reserve root PD while releasing it 



commit 2642cf11 upstream.

Otherwise somebody could try to evict it at the same time and try to use
half torn down structures.

Signed-off-by: default avatarChristian König <christian.koenig@amd.com>
Reviewed-and-Tested-by: default avatarMichel Dänzer <michel.daenzer@amd.com>
Reviewed-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Signed-off-by: default avatarLyude Paul <lyude@redhat.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 509536b2

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

+11 −2
Original line number Diff line number Diff line
@@ -2586,7 +2586,8 @@ void amdgpu_vm_fini(struct amdgpu_device *adev, struct amdgpu_vm *vm) 
{

	struct amdgpu_bo_va_mapping *mapping, *tmp;

	bool prt_fini_needed = !!adev->gart.gart_funcs->set_prt;

	int i;

	struct amdgpu_bo *root;

	int i, r;



	amd_sched_entity_fini(vm->entity.sched, &vm->entity);
@@ -2609,7 +2610,15 @@ void amdgpu_vm_fini(struct amdgpu_device *adev, struct amdgpu_vm *vm) 
		amdgpu_vm_free_mapping(adev, vm, mapping, NULL);

	}



	root = amdgpu_bo_ref(vm->root.bo);

	r = amdgpu_bo_reserve(root, true);

	if (r) {

		dev_err(adev->dev, "Leaking page tables because BO reservation failed\n");

	} else {

		amdgpu_vm_free_levels(&vm->root);

		amdgpu_bo_unreserve(root);

	}

	amdgpu_bo_unref(&root);

	dma_fence_put(vm->last_dir_update);

	for (i = 0; i < AMDGPU_MAX_VMHUBS; i++)

		amdgpu_vm_free_reserved_vmid(adev, vm, i);