[PATCH] drm/amdkfd: fix warning when CONFIG_HSA_AMD_P2P is not set

[Alex Deucher]

On Fri, Jun 10, 2022 at 11:43 AM Alex Deucher <alexander.deucher at amd.com> wrote:
>
> drivers/gpu/drm/amd/amdgpu/../amdkfd/kfd_topology.c:1542:11:
> warning: variable 'i' set but not used [-Wunused-but-set-variable]
>
> Reported-by: kernel test robot <lkp at intel.com>
> Signed-off-by: Alex Deucher <alexander.deucher at amd.com>
> ---
>  drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c   | 4 ++++
>  drivers/gpu/drm/amd/amdkfd/kfd_topology.c | 7 +++++--
>  2 files changed, 9 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c
> index aebc384531ac..88a0e3ac0f33 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c
> @@ -773,6 +773,10 @@ void amdgpu_gmc_init_pdb0(struct amdgpu_device *adev)
>   */
>  uint64_t amdgpu_gmc_vram_mc2pa(struct amdgpu_device *adev, uint64_t mc_addr)
>  {
> +       dev_info(adev->dev, "amdgpu_gmc_vram_mc2pa: 0x%0llx, 0x%0llx, 0x%0llx\n",
> +                mc_addr,
> +                adev->gmc.vram_start,
> +                adev->vm_manager.vram_base_offset);
>         return mc_addr - adev->gmc.vram_start + adev->vm_manager.vram_base_offset;
>  }

Ignore this hunk.  Didn't mean to commit this.

Alex

>
> diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_topology.c b/drivers/gpu/drm/amd/amdkfd/kfd_topology.c
> index 3e240b22ec91..411447357196 100644
> --- a/drivers/gpu/drm/amd/amdkfd/kfd_topology.c
> +++ b/drivers/gpu/drm/amd/amdkfd/kfd_topology.c
> @@ -1539,7 +1539,10 @@ static int kfd_dev_create_p2p_links(void)
>  {
>         struct kfd_topology_device *dev;
>         struct kfd_topology_device *new_dev;
> -       uint32_t i, k;
> +#if defined(CONFIG_HSA_AMD_P2P)
> +       uint32_t i;
> +#endif
> +       uint32_t k;
>         int ret = 0;
>
>         k = 0;
> @@ -1553,7 +1556,6 @@ static int kfd_dev_create_p2p_links(void)
>                 return 0;
>
>         k--;
> -       i = 0;
>
>         /* create in-direct links */
>         ret = kfd_create_indirect_link_prop(new_dev, k);
> @@ -1562,6 +1564,7 @@ static int kfd_dev_create_p2p_links(void)
>
>         /* create p2p links */
>  #if defined(CONFIG_HSA_AMD_P2P)
> +       i = 0;
>         list_for_each_entry(dev, &topology_device_list, list) {
>                 if (dev == new_dev)
>                         break;
> --
> 2.35.3
>