drm/amdgpu: call amdgpu_vm_prt_fini before deleting the root PD (ee8bcc23) · Commits · 戴 / test

amdgpu_vm_prt_fini uses "vm->root.base.bo" so it must still be valid when we call it. Fixes: ("drm/amdgpu: reserve the root PD while freeing PASIDs") Signed-off-by:

Pierre-Eric Pelloux-Prayer <pierre-eric.pelloux-prayer@amd.com> Reviewed-by:

Christian König <christian.koenig@amd.com> Signed-off-by:

Alex Deucher <alexander.deucher@amd.com>

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

+10 −9

Original line number	Diff line number	Diff line
		@@ -2971,6 +2971,16 @@ void amdgpu_vm_fini(struct amdgpu_device adev, struct amdgpu_vm vm)
		vm->pasid = 0;
		}

		list_for_each_entry_safe(mapping, tmp, &vm->freed, list) {
		if (mapping->flags & AMDGPU_PTE_PRT && prt_fini_needed) {
		amdgpu_vm_prt_fini(adev, vm);
		prt_fini_needed = false;
		}

		list_del(&mapping->list);
		amdgpu_vm_free_mapping(adev, vm, mapping, NULL);
		}

		amdgpu_vm_free_pts(adev, vm, NULL);
		amdgpu_bo_unreserve(root);
		amdgpu_bo_unref(&root);
		@@ -2990,15 +3000,6 @@ void amdgpu_vm_fini(struct amdgpu_device adev, struct amdgpu_vm vm)
		list_del(&mapping->list);
		kfree(mapping);
		}
		list_for_each_entry_safe(mapping, tmp, &vm->freed, list) {
		if (mapping->flags & AMDGPU_PTE_PRT && prt_fini_needed) {
		amdgpu_vm_prt_fini(adev, vm);
		prt_fini_needed = false;
		}

		list_del(&mapping->list);
		amdgpu_vm_free_mapping(adev, vm, mapping, NULL);
		}

		dma_fence_put(vm->last_update);
		for (i = 0; i < AMDGPU_MAX_VMHUBS; i++)

Admin message