[PATCH v2] drm/amdkfd: Check use_xgmi_p2p before reporting hive_id

[Felix Kuehling]

Am 2022-03-23 um 10:20 schrieb Divya Shikre:
> Recently introduced commit "845ebd6b7c32 drm/amdgpu: Add
> use_xgmi_p2p module parameter" did not update XGMI iolinks
> when use_xgmi_p2p is disabled. Add fix to not create XGMI
> iolinks in KFD topology when this parameter is disabled.
>
> Signed-off-by: Divya Shikre <DivyaUday.Shikre at amd.com>

Reviewed-by: Felix Kuehling <Felix.Kuehling at amd.com>


> ---
>   drivers/gpu/drm/amd/amdkfd/kfd_device.c | 3 ++-
>   1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_device.c b/drivers/gpu/drm/amd/amdkfd/kfd_device.c
> index 339e12c94cff..d5536e33b3d8 100644
> --- a/drivers/gpu/drm/amd/amdkfd/kfd_device.c
> +++ b/drivers/gpu/drm/amd/amdkfd/kfd_device.c
> @@ -536,7 +536,8 @@ bool kgd2kfd_device_init(struct kfd_dev *kfd,
>   		goto kfd_doorbell_error;
>   	}
>   
> -	kfd->hive_id = kfd->adev->gmc.xgmi.hive_id;
> +	if (amdgpu_use_xgmi_p2p)
> +		kfd->hive_id = kfd->adev->gmc.xgmi.hive_id;
>   
>   	kfd->noretry = kfd->adev->gmc.noretry;
>