Commit 6f4b590a authored by Yifan Zhang's avatar Yifan Zhang Committed by Alex Deucher
Browse files

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: default avataryouling <youling257@gmail.com>
Tested-by: default avataryouling <youling257@gmail.com>
Signed-off-by: default avatarYifan Zhang <yifan1.zhang@amd.com>
Reviewed-by: default avatarJames Zhu <James.Zhu@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent afd18180

drivers/gpu/drm/amd/amdkfd/kfd_device.c

+1 −0
Original line number Diff line number Diff line
@@ -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;

	}