[PATCH V2] drm/amdgpu: Fix VM clean check method

[Christian König]

Am 30.04.19 um 16:48 schrieb Trigger Huang:
> amdgpu_vm_make_compute is used to turn a GFX VM into a compute VM,
> the prerequisite is this VM is clean. Let's check if some page tables
> are already filled , while not check if some mapping is already made.
>
> Signed-off-by: Trigger Huang <Trigger.Huang at amd.com>
> ---
>   drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 33 ++++++++++++++++++++++++++++++++-
>   1 file changed, 32 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
> index 56d838f..bde8bcd 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
> @@ -2755,6 +2755,37 @@ int amdgpu_vm_init(struct amdgpu_device *adev, struct amdgpu_vm *vm,
>   }
>   
>   /**
> + * amdgpu_vm_check_clean_reserved - check if a VM is clean
> + *
> + * @adev: amdgpu_device pointer
> + * @vm: the VM to check
> + *
> + * check all entries of the root PD, if any subsequent PDs are allocated,
> + * it means there are page table creating and filling, and is no a clean
> + * VM
> + *
> + * Returns:
> + *	0 if this VM is clean
> + */
> +static int amdgpu_vm_check_clean_reserved(struct amdgpu_device *adev,
> +	struct amdgpu_vm *vm)
> +{
> +	enum amdgpu_vm_level root = adev->vm_manager.root_level;
> +	unsigned int entries = amdgpu_vm_num_entries(adev, root);
> +	unsigned int i = 0;
> +
> +	if (!(vm->root.entries))
> +		return 0;
> +
> +	for (i = 0; i < entries; i++) {
> +		if (vm->root.entries[i].base.bo)
> +			return -EINVAL;
> +	}
> +
> +	return 0;
> +}
> +
> +/**
>    * amdgpu_vm_make_compute - Turn a GFX VM into a compute VM
>    *
>    * @adev: amdgpu_device pointer
> @@ -2784,7 +2815,7 @@ int amdgpu_vm_make_compute(struct amdgpu_device *adev, struct amdgpu_vm *vm, uns
>   		return r;
>   
>   	/* Sanity checks */
> -	if (!RB_EMPTY_ROOT(&vm->va.rb_root) || vm->root.entries) {
> +	if (amdgpu_vm_check_clean_reserved(adev, vm)) {

Maybe use the common coding idiom for this here:

r = amdgpu_vm_check_clean..
if (r)....

>   		r = -EINVAL;

That would also avoid the manual assignment here.

With that fixed the patch is Reviewed-by: Christian König 
<christian.koenig at amd.com>.

Thanks for taking care of this,
Christian.

>   		goto unreserve_bo;
>   	}