Re: [PATCH] drm/amdgpu: Removed used parameter

[Lazar, Lijo]

On 2/27/2024 9:23 PM, Harish Kasiviswanathan wrote:
> Also passing adev is misleading if BO is associated with different adev.
> In this case BO is mapped to a different device
> 
Looks like a typo in subject - unused?

Thanks,
Lijo

> Signed-off-by: Harish Kasiviswanathan 
> ---
>  drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.h   | 2 +-
>  drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c | 4 ++--
>  drivers/gpu/drm/amd/amdkfd/kfd_chardev.c | 2 +-
>  3 files changed, 4 insertions(+), 4 deletions(-)
> 
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.h 
> b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.h
> index 4fb32d86cd0e..0ef223c2affb 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.h
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.h
> @@ -320,7 +320,7 @@ int amdgpu_amdkfd_gpuvm_map_gtt_bo_to_kernel(struct 
> kgd_mem *mem,
>void **kptr, uint64_t *size);
>  void amdgpu_amdkfd_gpuvm_unmap_gtt_bo_from_kernel(struct kgd_mem *mem);
>  
> -int amdgpu_amdkfd_map_gtt_bo_to_gart(struct amdgpu_device *adev, struct 
> amdgpu_bo *bo);
> +int amdgpu_amdkfd_map_gtt_bo_to_gart(struct amdgpu_bo *bo);
>  
>  int amdgpu_amdkfd_gpuvm_restore_process_bos(void *process_info,
>   struct dma_fence __rcu **ef);
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c 
> b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c
> index ef71b12062a1..d0819fa5fcd8 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c
> @@ -2189,13 +2189,13 @@ int amdgpu_amdkfd_gpuvm_sync_memory(
>  
>  /**
>   * amdgpu_amdkfd_map_gtt_bo_to_gart - Map BO to GART and increment reference 
> count
> - * @adev: Device to which allocated BO belongs
>   * @bo: Buffer object to be mapped
>   *
> + * BO will be mapped to GART of adev to which it is previously associated 
> with
>   * Before return, bo reference count is incremented. To release the 
> reference and unpin/
>   * unmap the BO, call amdgpu_amdkfd_free_gtt_mem.
>   */
> -int amdgpu_amdkfd_map_gtt_bo_to_gart(struct amdgpu_device *adev, struct 
> amdgpu_bo *bo)
> +int amdgpu_amdkfd_map_gtt_bo_to_gart(struct amdgpu_bo *bo)
>  {
>   int ret;
>  
> diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_chardev.c 
> b/drivers/gpu/drm/amd/amdkfd/kfd_chardev.c
> index 824e660283b2..f030cafc5a0a 100644
> --- a/drivers/gpu/drm/amd/amdkfd/kfd_chardev.c
> +++ b/drivers/gpu/drm/amd/amdkfd/kfd_chardev.c
> @@ -371,7 +371,7 @@ static int kfd_ioctl_create_queue(struct file *filep, 
> struct kfd_process *p,
>   goto err_wptr_map_gart;
>   }
>  
> - err = amdgpu_amdkfd_map_gtt_bo_to_gart(dev->adev, wptr_bo);
> + err = amdgpu_amdkfd_map_gtt_bo_to_gart(wptr_bo);
>   if (err) {
>   pr_err("Failed to map wptr bo to GART\n");
>   goto err_wptr_map_gart;

Re: [PATCH] drm/amdgpu: Removed used parameter

[Alex Deucher]

On Tue, Feb 27, 2024 at 11:13 AM Harish Kasiviswanathan
 wrote:
>
> Also passing adev is misleading if BO is associated with different adev.
> In this case BO is mapped to a different device
>
> Signed-off-by: Harish Kasiviswanathan 

Acked-by: Alex Deucher 

> ---
>  drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.h   | 2 +-
>  drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c | 4 ++--
>  drivers/gpu/drm/amd/amdkfd/kfd_chardev.c | 2 +-
>  3 files changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.h 
> b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.h
> index 4fb32d86cd0e..0ef223c2affb 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.h
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.h
> @@ -320,7 +320,7 @@ int amdgpu_amdkfd_gpuvm_map_gtt_bo_to_kernel(struct 
> kgd_mem *mem,
>  void **kptr, uint64_t *size);
>  void amdgpu_amdkfd_gpuvm_unmap_gtt_bo_from_kernel(struct kgd_mem *mem);
>
> -int amdgpu_amdkfd_map_gtt_bo_to_gart(struct amdgpu_device *adev, struct 
> amdgpu_bo *bo);
> +int amdgpu_amdkfd_map_gtt_bo_to_gart(struct amdgpu_bo *bo);
>
>  int amdgpu_amdkfd_gpuvm_restore_process_bos(void *process_info,
> struct dma_fence __rcu **ef);
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c 
> b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c
> index ef71b12062a1..d0819fa5fcd8 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c
> @@ -2189,13 +2189,13 @@ int amdgpu_amdkfd_gpuvm_sync_memory(
>
>  /**
>   * amdgpu_amdkfd_map_gtt_bo_to_gart - Map BO to GART and increment reference 
> count
> - * @adev: Device to which allocated BO belongs
>   * @bo: Buffer object to be mapped
>   *
> + * BO will be mapped to GART of adev to which it is previously associated 
> with
>   * Before return, bo reference count is incremented. To release the 
> reference and unpin/
>   * unmap the BO, call amdgpu_amdkfd_free_gtt_mem.
>   */
> -int amdgpu_amdkfd_map_gtt_bo_to_gart(struct amdgpu_device *adev, struct 
> amdgpu_bo *bo)
> +int amdgpu_amdkfd_map_gtt_bo_to_gart(struct amdgpu_bo *bo)
>  {
> int ret;
>
> diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_chardev.c 
> b/drivers/gpu/drm/amd/amdkfd/kfd_chardev.c
> index 824e660283b2..f030cafc5a0a 100644
> --- a/drivers/gpu/drm/amd/amdkfd/kfd_chardev.c
> +++ b/drivers/gpu/drm/amd/amdkfd/kfd_chardev.c
> @@ -371,7 +371,7 @@ static int kfd_ioctl_create_queue(struct file *filep, 
> struct kfd_process *p,
> goto err_wptr_map_gart;
> }
>
> -   err = amdgpu_amdkfd_map_gtt_bo_to_gart(dev->adev, wptr_bo);
> +   err = amdgpu_amdkfd_map_gtt_bo_to_gart(wptr_bo);
> if (err) {
> pr_err("Failed to map wptr bo to GART\n");
> goto err_wptr_map_gart;
> --
> 2.34.1
>

[PATCH] drm/amdgpu: Removed used parameter

[Harish Kasiviswanathan]

Also passing adev is misleading if BO is associated with different adev.
In this case BO is mapped to a different device

Signed-off-by: Harish Kasiviswanathan 
---
 drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.h   | 2 +-
 drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c | 4 ++--
 drivers/gpu/drm/amd/amdkfd/kfd_chardev.c | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.h 
b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.h
index 4fb32d86cd0e..0ef223c2affb 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.h
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.h
@@ -320,7 +320,7 @@ int amdgpu_amdkfd_gpuvm_map_gtt_bo_to_kernel(struct kgd_mem 
*mem,
 void **kptr, uint64_t *size);
 void amdgpu_amdkfd_gpuvm_unmap_gtt_bo_from_kernel(struct kgd_mem *mem);
 
-int amdgpu_amdkfd_map_gtt_bo_to_gart(struct amdgpu_device *adev, struct 
amdgpu_bo *bo);
+int amdgpu_amdkfd_map_gtt_bo_to_gart(struct amdgpu_bo *bo);
 
 int amdgpu_amdkfd_gpuvm_restore_process_bos(void *process_info,
struct dma_fence __rcu **ef);
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c 
b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c
index ef71b12062a1..d0819fa5fcd8 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c
@@ -2189,13 +2189,13 @@ int amdgpu_amdkfd_gpuvm_sync_memory(
 
 /**
  * amdgpu_amdkfd_map_gtt_bo_to_gart - Map BO to GART and increment reference 
count
- * @adev: Device to which allocated BO belongs
  * @bo: Buffer object to be mapped
  *
+ * BO will be mapped to GART of adev to which it is previously associated with
  * Before return, bo reference count is incremented. To release the reference 
and unpin/
  * unmap the BO, call amdgpu_amdkfd_free_gtt_mem.
  */
-int amdgpu_amdkfd_map_gtt_bo_to_gart(struct amdgpu_device *adev, struct 
amdgpu_bo *bo)
+int amdgpu_amdkfd_map_gtt_bo_to_gart(struct amdgpu_bo *bo)
 {
int ret;
 
diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_chardev.c 
b/drivers/gpu/drm/amd/amdkfd/kfd_chardev.c
index 824e660283b2..f030cafc5a0a 100644
--- a/drivers/gpu/drm/amd/amdkfd/kfd_chardev.c
+++ b/drivers/gpu/drm/amd/amdkfd/kfd_chardev.c
@@ -371,7 +371,7 @@ static int kfd_ioctl_create_queue(struct file *filep, 
struct kfd_process *p,
goto err_wptr_map_gart;
}
 
-   err = amdgpu_amdkfd_map_gtt_bo_to_gart(dev->adev, wptr_bo);
+   err = amdgpu_amdkfd_map_gtt_bo_to_gart(wptr_bo);
if (err) {
pr_err("Failed to map wptr bo to GART\n");
goto err_wptr_map_gart;
-- 
2.34.1