From 6f80d70ed2699b119ff7cfe37bc88fda1ee6a426 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Wed, 3 Nov 2021 19:06:13 +0100 Subject: [PATCH] 5.14-stable patches added patches: drm-amdkfd-fix-boot-failure-when-iommu-is-disabled-in-picasso.patch --- ...re-when-iommu-is-disabled-in-picasso.patch | 48 +++++++++++++++++++ queue-5.14/series | 1 + 2 files changed, 49 insertions(+) create mode 100644 queue-5.14/drm-amdkfd-fix-boot-failure-when-iommu-is-disabled-in-picasso.patch diff --git a/queue-5.14/drm-amdkfd-fix-boot-failure-when-iommu-is-disabled-in-picasso.patch b/queue-5.14/drm-amdkfd-fix-boot-failure-when-iommu-is-disabled-in-picasso.patch new file mode 100644 index 00000000000..460a205ff4d --- /dev/null +++ b/queue-5.14/drm-amdkfd-fix-boot-failure-when-iommu-is-disabled-in-picasso.patch @@ -0,0 +1,48 @@ +From afd18180c07026f94a80ff024acef5f4159084a4 Mon Sep 17 00:00:00 2001 +From: Yifan Zhang +Date: Mon, 11 Oct 2021 20:37:01 +0800 +Subject: drm/amdkfd: fix boot failure when iommu is disabled in Picasso. + +From: Yifan Zhang + +commit afd18180c07026f94a80ff024acef5f4159084a4 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: youling +Tested-by: youling +Signed-off-by: Yifan Zhang +Reviewed-by: James Zhu +Signed-off-by: Alex Deucher +Signed-off-by: Greg Kroah-Hartman +--- + drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 4 ---- + drivers/gpu/drm/amd/amdkfd/kfd_device.c | 3 +++ + 2 files changed, 3 insertions(+), 4 deletions(-) + +--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c ++++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +@@ -2380,10 +2380,6 @@ static int amdgpu_device_ip_init(struct + 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: +--- a/drivers/gpu/drm/amd/amdkfd/kfd_device.c ++++ b/drivers/gpu/drm/amd/amdkfd/kfd_device.c +@@ -875,6 +875,9 @@ bool kgd2kfd_device_init(struct kfd_dev + + 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; + diff --git a/queue-5.14/series b/queue-5.14/series index b258a42022d..0b86464732e 100644 --- a/queue-5.14/series +++ b/queue-5.14/series @@ -4,3 +4,4 @@ vrf-revert-reset-skb-conntrack-connection.patch media-firewire-firedtv-avc-fix-a-buffer-overflow-in-avc_ca_pmt.patch revert-xhci-set-hcd-flag-to-defer-primary-roothub-registration.patch revert-usb-core-hcd-add-support-for-deferring-roothub.patch +drm-amdkfd-fix-boot-failure-when-iommu-is-disabled-in-picasso.patch -- 2.47.3