[PATCH] drm/amdgpu: Remove amdgpu_device arg from free_sgt api

[Christian König]

Am 25.02.21 um 03:49 schrieb Ramesh Errabolu:
> Currently callers have to provide handle of amdgpu_device,
> which is not used by the implementation. It is unlikely this
> parameter will become useful in future, thus removing it
>
> Signed-off-by: Ramesh Errabolu <Ramesh.Errabolu at amd.com>

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

> ---
>   drivers/gpu/drm/amd/amdgpu/amdgpu_dma_buf.c  | 3 +--
>   drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h      | 3 +--
>   drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c | 4 +---
>   3 files changed, 3 insertions(+), 7 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_dma_buf.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_dma_buf.c
> index 2808d5752de1..e83d73ec0e9d 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_dma_buf.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_dma_buf.c
> @@ -359,14 +359,13 @@ static void amdgpu_dma_buf_unmap(struct dma_buf_attachment *attach,
>   	struct dma_buf *dma_buf = attach->dmabuf;
>   	struct drm_gem_object *obj = dma_buf->priv;
>   	struct amdgpu_bo *bo = gem_to_amdgpu_bo(obj);
> -	struct amdgpu_device *adev = amdgpu_ttm_adev(bo->tbo.bdev);
>   
>   	if (sgt->sgl->page_link) {
>   		dma_unmap_sgtable(attach->dev, sgt, dir, 0);
>   		sg_free_table(sgt);
>   		kfree(sgt);
>   	} else {
> -		amdgpu_vram_mgr_free_sgt(adev, attach->dev, dir, sgt);
> +		amdgpu_vram_mgr_free_sgt(attach->dev, dir, sgt);
>   	}
>   }
>   
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h
> index 927d33d75c22..028f200a3509 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h
> @@ -121,8 +121,7 @@ int amdgpu_vram_mgr_alloc_sgt(struct amdgpu_device *adev,
>   			      struct device *dev,
>   			      enum dma_data_direction dir,
>   			      struct sg_table **sgt);
> -void amdgpu_vram_mgr_free_sgt(struct amdgpu_device *adev,
> -			      struct device *dev,
> +void amdgpu_vram_mgr_free_sgt(struct device *dev,
>   			      enum dma_data_direction dir,
>   			      struct sg_table *sgt);
>   uint64_t amdgpu_vram_mgr_usage(struct ttm_resource_manager *man);
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c
> index b325b067926b..14936bc713b0 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c
> @@ -734,15 +734,13 @@ int amdgpu_vram_mgr_alloc_sgt(struct amdgpu_device *adev,
>   /**
>    * amdgpu_vram_mgr_free_sgt - allocate and fill a sg table
>    *
> - * @adev: amdgpu device pointer
>    * @dev: device pointer
>    * @dir: data direction of resource to unmap
>    * @sgt: sg table to free
>    *
>    * Free a previously allocate sg table.
>    */
> -void amdgpu_vram_mgr_free_sgt(struct amdgpu_device *adev,
> -			      struct device *dev,
> +void amdgpu_vram_mgr_free_sgt(struct device *dev,
>   			      enum dma_data_direction dir,
>   			      struct sg_table *sgt)
>   {