[PATCH 4/5] drm/amdgpu: cleanup amdgpu_bo_create()

[Christian König]

Am 22.04.21 um 14:35 schrieb Nirmoy Das:
> Remove shadow bo related code as vm code is creating shadow bo
> using proper API.
>
> Signed-off-by: Nirmoy Das <nirmoy.das at amd.com>
> ---
>   drivers/gpu/drm/amd/amdgpu/amdgpu_object.c | 30 ++--------------------
>   1 file changed, 2 insertions(+), 28 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c
> index 9cdeb20fb6cd..4256cbfec5eb 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c
> @@ -661,10 +661,7 @@ int amdgpu_bo_create_shadow(struct amdgpu_device *adev,
>    * @bp: parameters to be used for the buffer object
>    * @bo_ptr: pointer to the buffer object pointer
>    *
> - * Creates an &amdgpu_bo buffer object; and if requested, also creates a
> - * shadow object.
> - * Shadow object is used to backup the original buffer object, and is always
> - * in GTT.
> + * Creates an &amdgpu_bo buffer object.
>    *
>    * Returns:
>    * 0 for success or a negative error code on failure.
> @@ -673,30 +670,7 @@ int amdgpu_bo_create(struct amdgpu_device *adev,
>   		     struct amdgpu_bo_param *bp,
>   		     struct amdgpu_bo **bo_ptr)
>   {
> -	u64 flags = bp->flags;
> -	int r;
> -
> -	bp->flags = bp->flags & ~AMDGPU_GEM_CREATE_SHADOW;
> -
> -	r = amdgpu_bo_do_create(adev, bp, bo_ptr);
> -	if (r)
> -		return r;
> -
> -	if ((flags & AMDGPU_GEM_CREATE_SHADOW) && !(adev->flags & AMD_IS_APU)) {
> -		if (!bp->resv)
> -			WARN_ON(dma_resv_lock((*bo_ptr)->tbo.base.resv,
> -							NULL));
> -
> -		r = amdgpu_bo_create_shadow(adev, bp->size, *bo_ptr);
> -
> -		if (!bp->resv)
> -			dma_resv_unlock((*bo_ptr)->tbo.base.resv);
> -
> -		if (r)
> -			amdgpu_bo_unref(bo_ptr);
> -	}
> -
> -	return r;
> +	return  amdgpu_bo_do_create(adev, bp, bo_ptr);

You can just rename amdgpu_bo_do_create() into amdgpu_bo_create() now 
and drop the wrapper as far as I can see.

Christian.

>   }
>   
>   /**