* [PATCH] drm/amdgpu: remove unused parameter in amdgpu_gart_bind
@ 2021-06-17 14:09 Yifan Zhang
2021-06-17 15:26 ` Christian König
0 siblings, 1 reply; 2+ messages in thread
From: Yifan Zhang @ 2021-06-17 14:09 UTC (permalink / raw
To: amd-gfx; +Cc: Yifan Zhang
After commit 72a616bb953329bd97c6d6d4c64f3f40ed788a36,
pagelist is no long used in amdgpu_gart_bind. Remove it.
Signed-off-by: Yifan Zhang <yifan1.zhang@amd.com>
---
drivers/gpu/drm/amd/amdgpu/amdgpu_gart.c | 3 +--
drivers/gpu/drm/amd/amdgpu/amdgpu_gart.h | 3 +--
drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 7 +++----
3 files changed, 5 insertions(+), 8 deletions(-)
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_gart.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_gart.c
index 1091ec5d3592..9fbd1e62948b 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_gart.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_gart.c
@@ -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) {
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_gart.h b/drivers/gpu/drm/amd/amdgpu/amdgpu_gart.h
index e104022197ae..6ff87de620db 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_gart.h
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_gart.h
@@ -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
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
index e8033b6f2395..6297363ab740 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
@@ -857,7 +857,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;
@@ -871,11 +871,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:
@@ -951,7 +950,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",
--
2.25.1
_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] drm/amdgpu: remove unused parameter in amdgpu_gart_bind
2021-06-17 14:09 [PATCH] drm/amdgpu: remove unused parameter in amdgpu_gart_bind Yifan Zhang
@ 2021-06-17 15:26 ` Christian König
0 siblings, 0 replies; 2+ messages in thread
From: Christian König @ 2021-06-17 15:26 UTC (permalink / raw
To: Yifan Zhang, amd-gfx
Am 17.06.21 um 16:09 schrieb Yifan Zhang:
> After commit 72a616bb953329bd97c6d6d4c64f3f40ed788a36,
> pagelist is no long used in amdgpu_gart_bind. Remove it.
>
> Signed-off-by: Yifan Zhang <yifan1.zhang@amd.com>
Reviewed-by: Christian König <christian.koenig@amd.com>
> ---
> drivers/gpu/drm/amd/amdgpu/amdgpu_gart.c | 3 +--
> drivers/gpu/drm/amd/amdgpu/amdgpu_gart.h | 3 +--
> drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 7 +++----
> 3 files changed, 5 insertions(+), 8 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_gart.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_gart.c
> index 1091ec5d3592..9fbd1e62948b 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_gart.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_gart.c
> @@ -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) {
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_gart.h b/drivers/gpu/drm/amd/amdgpu/amdgpu_gart.h
> index e104022197ae..6ff87de620db 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_gart.h
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_gart.h
> @@ -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
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
> index e8033b6f2395..6297363ab740 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
> @@ -857,7 +857,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;
>
> @@ -871,11 +871,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:
> @@ -951,7 +950,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",
_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2021-06-17 15:26 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-06-17 14:09 [PATCH] drm/amdgpu: remove unused parameter in amdgpu_gart_bind Yifan Zhang
2021-06-17 15:26 ` Christian König
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.