Commit 942ab769 authored by Yifan Zhang's avatar Yifan Zhang Committed by Alex Deucher
Browse files

drm/amdgpu: remove unused parameter in amdgpu_gart_bind 



Pagelist is no long used in amdgpu_gart_bind. Remove it.

Signed-off-by: default avatarYifan Zhang <yifan1.zhang@amd.com>
Reviewed-by: default avatarChristian König <christian.koenig@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent f1802aa7

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

+1 −2
Original line number Diff line number Diff line
@@ -300,7 +300,6 @@ int amdgpu_gart_map(struct amdgpu_device *adev, uint64_t offset, 
 * @adev: amdgpu_device pointer

 * @offset: offset into the GPU's gart aperture

 * @pages: number of pages to bind

 * @pagelist: pages to bind

 * @dma_addr: DMA addresses of pages

 * @flags: page table entry flags

 *
@@ -309,7 +308,7 @@ int amdgpu_gart_map(struct amdgpu_device *adev, uint64_t offset, 
 * Returns 0 for success, -EINVAL for failure.

 */

int amdgpu_gart_bind(struct amdgpu_device *adev, uint64_t offset,

		     int pages, struct page **pagelist, dma_addr_t *dma_addr,

		     int pages, dma_addr_t *dma_addr,

		     uint64_t flags)

{

	if (!adev->gart.ready) {

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

+1 −2
Original line number Diff line number Diff line
@@ -64,7 +64,6 @@ int amdgpu_gart_map(struct amdgpu_device *adev, uint64_t offset, 
		    int pages, dma_addr_t *dma_addr, uint64_t flags,

		    void *dst);

int amdgpu_gart_bind(struct amdgpu_device *adev, uint64_t offset,

		     int pages, struct page **pagelist,

		     dma_addr_t *dma_addr, uint64_t flags);

		     int pages, dma_addr_t *dma_addr, uint64_t flags);

void amdgpu_gart_invalidate_tlb(struct amdgpu_device *adev);

#endif

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

+3 −4
Original line number Diff line number Diff line
@@ -841,7 +841,7 @@ static int amdgpu_ttm_gart_bind(struct amdgpu_device *adev, 
		uint64_t page_idx = 1;



		r = amdgpu_gart_bind(adev, gtt->offset, page_idx,

				ttm->pages, gtt->ttm.dma_address, flags);

				gtt->ttm.dma_address, flags);

		if (r)

			goto gart_bind_fail;
@@ -855,11 +855,10 @@ static int amdgpu_ttm_gart_bind(struct amdgpu_device *adev, 
		r = amdgpu_gart_bind(adev,

				gtt->offset + (page_idx << PAGE_SHIFT),

				ttm->num_pages - page_idx,

				&ttm->pages[page_idx],

				&(gtt->ttm.dma_address[page_idx]), flags);

	} else {

		r = amdgpu_gart_bind(adev, gtt->offset, ttm->num_pages,

				     ttm->pages, gtt->ttm.dma_address, flags);

				     gtt->ttm.dma_address, flags);

	}



gart_bind_fail:
@@ -935,7 +934,7 @@ static int amdgpu_ttm_backend_bind(struct ttm_device *bdev, 
	/* bind pages into GART page tables */

	gtt->offset = (u64)bo_mem->start << PAGE_SHIFT;

	r = amdgpu_gart_bind(adev, gtt->offset, ttm->num_pages,

		ttm->pages, gtt->ttm.dma_address, flags);

		gtt->ttm.dma_address, flags);



	if (r)

		DRM_ERROR("failed to bind %u pages at 0x%08llX\n",