Skip to content

Commit 832fad3

Browse files
yifancomgregkh
authored andcommitted
drm/amdkfd: fix resume error when iommu disabled in Picasso
[ Upstream commit 6f4b590 ] 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> Signed-off-by: Sasha Levin <sashal@kernel.org>
1 parent 65c84e0 commit 832fad3

1 file changed

Lines changed: 1 addition & 0 deletions

File tree

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -744,6 +744,7 @@ bool kgd2kfd_device_init(struct kfd_dev *kfd,
744744
kfd_double_confirm_iommu_support(kfd);
745745

746746
if (kfd_iommu_device_init(kfd)) {
747+
kfd->use_iommu_v2 = false;
747748
dev_err(kfd_device, "Error initializing iommuv2\n");
748749
goto device_iommu_error;
749750
}

0 commit comments

Comments
 (0)