From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Wed, 3 Nov 2021 18:06:30 +0000 (+0100)
Subject: 5.15-stable patches
X-Git-Tag: v4.19.216~25
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=4bce7c0d5390c5d4bb3fa6427943d6e4ecb26c55;p=thirdparty%2Fkernel%2Fstable-queue.git

5.15-stable patches

added patches:
	drm-amdkfd-fix-boot-failure-when-iommu-is-disabled-in-picasso.patch
---

diff --git a/queue-5.15/drm-amdkfd-fix-boot-failure-when-iommu-is-disabled-in-picasso.patch b/queue-5.15/drm-amdkfd-fix-boot-failure-when-iommu-is-disabled-in-picasso.patch
new file mode 100644
index 00000000000..197ca711396
--- /dev/null
+++ b/queue-5.15/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 <yifan1.zhang@amd.com>
+Date: Mon, 11 Oct 2021 20:37:01 +0800
+Subject: drm/amdkfd: fix boot failure when iommu is disabled in Picasso.
+
+From: Yifan Zhang <yifan1.zhang@amd.com>
+
+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 <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: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ 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
+@@ -2432,10 +2432,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
+@@ -924,6 +924,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.15/series b/queue-5.15/series
index 322966353ad..b7e31698fc0 100644
--- a/queue-5.15/series
+++ b/queue-5.15/series
@@ -2,3 +2,4 @@ sfc-fix-reading-non-legacy-supported-link-modes.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