drm/amdkfd: fix resume error when iommu disabled in Picasso
authorjsg <jsg@openbsd.org>
Fri, 19 Nov 2021 03:08:23 +0000 (03:08 +0000)
committerjsg <jsg@openbsd.org>
Fri, 19 Nov 2021 03:08:23 +0000 (03:08 +0000)
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

index 903170e..5751bdd 100644 (file)
@@ -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;
        }