Commit f17dca0a authored by Yifan Zhang's avatar Yifan Zhang Committed by Greg Kroah-Hartman
Browse files

drm/amdkfd: fix boot failure when iommu is disabled in Picasso. 



commit afd18180 upstream.

When IOMMU disabled in sbios and kfd in iommuv2 path, iommuv2
init will fail. But this failure should not block amdgpu driver init.

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>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent f5e3b7f0

drivers/gpu/drm/amd/amdgpu/amdgpu_device.c

+0 −4
Original line number Diff line number Diff line
@@ -2432,10 +2432,6 @@ static int amdgpu_device_ip_init(struct amdgpu_device *adev) 
	if (!adev->gmc.xgmi.pending_reset)

		amdgpu_amdkfd_device_init(adev);



	r = amdgpu_amdkfd_resume_iommu(adev);

	if (r)

		goto init_failed;



	amdgpu_fru_get_product_info(adev);



init_failed:

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

+3 −0
Original line number Diff line number Diff line
@@ -924,6 +924,9 @@ bool kgd2kfd_device_init(struct kfd_dev *kfd, 


	svm_migrate_init((struct amdgpu_device *)kfd->kgd);



	if(kgd2kfd_resume_iommu(kfd))

		goto device_iommu_error;



	if (kfd_resume(kfd))

		goto kfd_resume_error;