Commit 5392b2af authored by Ramesh Errabolu's avatar Ramesh Errabolu Committed by Alex Deucher
Browse files

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: default avatarChristian König <christian.koenig@amd.com>
Signed-off-by: default avatarRamesh Errabolu <Ramesh.Errabolu@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 8f8c80f4

drivers/gpu/drm/amd/amdgpu/amdgpu_dma_buf.c

+1 −6
Original line number Diff line number Diff line
@@ -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 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);

	}

}

drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h

+1 −2
Original line number Diff line number Diff line
@@ -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);

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);

drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c

+1 −3
Original line number Diff line number Diff line
@@ -731,15 +731,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)

{