[PATCH 1/2] Revert "drm/amdkfd: fix boot failure when iommu is disabled in Picasso."

James Zhu James.Zhu at amd.com
Tue Nov 2 19:23:23 UTC 2021


To revert wrong merge during rebase.
This reverts commit afd18180c07026f94a80ff024acef5f4159084a4.
---
 drivers/gpu/drm/amd/amdkfd/kfd_device.c | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_device.c b/drivers/gpu/drm/amd/amdkfd/kfd_device.c
index 7677ced16a27..be26c4016ade 100644
--- a/drivers/gpu/drm/amd/amdkfd/kfd_device.c
+++ b/drivers/gpu/drm/amd/amdkfd/kfd_device.c
@@ -1031,9 +1031,6 @@ bool kgd2kfd_device_init(struct kfd_dev *kfd,
 
 	svm_migrate_init(kfd->adev);
 
-	if(kgd2kfd_resume_iommu(kfd))
-		goto device_iommu_error;
-
 	if (kfd_resume(kfd))
 		goto kfd_resume_error;
 
-- 
2.25.1



More information about the amd-gfx mailing list