drm/amdkfd: fix resume error when iommu disabled in Picasso

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@gmail.com>
Tested-by: youling <youling257@gmail.com>
Signed-off-by: Yifan Zhang <yifan1.zhang@amd.com>
Reviewed-by: James Zhu <James.Zhu@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_device.c b/drivers/gpu/drm/amd/amdkfd/kfd_device.c
index 08eedbc6699dd0508aaf9ee2891d8702d7b4707c..99d2b9c875ea8f1ef1b3891a41a8788f5e7394bd 100644 (file)
--- 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;
        }