drm/amdgpu: Remove amdgpu_device arg from free_sgt api (v2)

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

v2: squash in unused variable fix

Reviewed-by: Christian König <[email protected]>
Signed-off-by: Ramesh Errabolu <[email protected]>
Signed-off-by: Alex Deucher <[email protected]>

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_dma_buf.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_dma_buf.c
index 47e0b48dc26fd72f0a5e4869a3b0ba677e6db2da..1efcf1d73ed67401c80d46aa5d30e19cafd0020b 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_dma_buf.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_dma_buf.c
@@ -321,17 +321,12 @@ static void amdgpu_dma_buf_unmap(struct dma_buf_attachment *attach,
                                 struct sg_table *sgt,
                                 enum dma_data_direction dir)
 {
                                 struct sg_table *sgt,
                                 enum dma_data_direction dir)
 {

-       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 {
        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 1eee65494a9657bbffd534b544669df379913f87..9117d8749c7a6a7647a66da12bc0625cdb47c04a 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h
@@ -117,8 +117,7 @@ int amdgpu_vram_mgr_alloc_sgt(struct amdgpu_device *adev,
                              struct device *dev,
                              enum dma_data_direction dir,
                              struct sg_table **sgt);
                              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);
                              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 de7db14de8ef71dc37c0b2881ef40d09105fab05..96fa1833cd9268cc13129b89f92d0aedf68c551a 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c
@@ -731,15 +731,13 @@ error_free:
 /**
  * amdgpu_vram_mgr_free_sgt - allocate and fill a sg table
  *
 /**
  * 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.
  */
  * @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)
 {
                              enum dma_data_direction dir,
                              struct sg_table *sgt)
 {