[PATCH v2 2/2] drm/amdkfd: fix resume error when iommu disabled in Picasso

[youling 257]

will it merge into linux 5.15 release?

2021-10-13 14:16 GMT+08:00, Yifan Zhang <yifan1.zhang at amd.com>:
> When IOMMU disabled in sbios and kfd in iommuv2 path,
> IOMMU resume failure blocks system resume. Don't allow kfd to
> use iommu v2 when iommu is disabled.
>
> Reported-by: youling <youling257 at gmail.com>
> Tested-by: youling <youling257 at gmail.com>
> Signed-off-by: Yifan Zhang <yifan1.zhang at amd.com>
> ---
>  drivers/gpu/drm/amd/amdkfd/kfd_device.c | 1 +
>  1 file changed, 1 insertion(+)
>
> diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_device.c
> b/drivers/gpu/drm/amd/amdkfd/kfd_device.c
> index 08eedbc6699d..99d2b9c875ea 100644
> --- a/drivers/gpu/drm/amd/amdkfd/kfd_device.c
> +++ b/drivers/gpu/drm/amd/amdkfd/kfd_device.c
> @@ -1021,6 +1021,7 @@ bool kgd2kfd_device_init(struct kfd_dev *kfd,
>  	kfd_double_confirm_iommu_support(kfd);
>
>  	if (kfd_iommu_device_init(kfd)) {
> +		kfd->use_iommu_v2 = false;
>  		dev_err(kfd_device, "Error initializing iommuv2\n");
>  		goto device_iommu_error;
>  	}
> --
> 2.25.1
>
>