From e971b9030c95e36638f619c9913e8caec499d092 Mon Sep 17 00:00:00 2001 From: jsg Date: Fri, 19 Nov 2021 03:08:23 +0000 Subject: [PATCH] drm/amdkfd: fix resume error when iommu disabled in Picasso From Yifan Zhang 832fad367cac9ca075a1aff92e21dc77ea308e96 in linux 5.10.y/5.10.80 6f4b590aae217da16cfa44039a2abcfb209137ab in mainline linux --- sys/dev/pci/drm/amd/amdkfd/kfd_device.c | 1 + 1 file changed, 1 insertion(+) diff --git a/sys/dev/pci/drm/amd/amdkfd/kfd_device.c b/sys/dev/pci/drm/amd/amdkfd/kfd_device.c index 903170e5934..5751bddc9ca 100644 --- a/sys/dev/pci/drm/amd/amdkfd/kfd_device.c +++ b/sys/dev/pci/drm/amd/amdkfd/kfd_device.c @@ -744,6 +744,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; } -- 2.20.1