[PATCH] drm/amdgpu: call amdgpu_vm_prt_fini before deleting the root PD

[Christian König]

Am 23.10.19 um 14:02 schrieb Pelloux-prayer, Pierre-eric:
> amdgpu_vm_prt_fini uses "vm->root.base.bo" so it must still be valid when
> we call it.
>
> Fixes: b65709a92156 ("drm/amdgpu: reserve the root PD while freeing PASIDs")
> Signed-off-by: Pierre-Eric Pelloux-Prayer <pierre-eric.pelloux-prayer at amd.com>

Reviewed-by: Christian König <christian.koenig at amd.com>

> ---
>   drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 19 ++++++++++---------
>   1 file changed, 10 insertions(+), 9 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
> index d9bece987e60..c8ce42200059 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
> @@ -2975,6 +2975,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);
> @@ -2994,15 +3004,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++)