This is a note to let you know that I've just added the patch titled
drm/amdgpu: move iommu_resume before ip init/resume
to the 5.10-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
drm-amdgpu-move-iommu_resume-before-ip-init-resume.patch
and it can be found in the queue-5.10 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
>From f02abeb0779700c308e661a412451b38962b8a0b Mon Sep 17 00:00:00 2001
From: James Zhu <James.Zhu@xxxxxxx>
Date: Tue, 7 Sep 2021 11:32:22 -0400
Subject: drm/amdgpu: move iommu_resume before ip init/resume
From: James Zhu <James.Zhu@xxxxxxx>
commit f02abeb0779700c308e661a412451b38962b8a0b upstream.
Separate iommu_resume from kfd_resume, and move it before
other amdgpu ip init/resume.
Bug: https://bugzilla.kernel.org/show_bug.cgi?id=211277
Signed-off-by: James Zhu <James.Zhu@xxxxxxx>
Reviewed-by: Felix Kuehling <Felix.Kuehling@xxxxxxx>
Signed-off-by: Alex Deucher <alexander.deucher@xxxxxxx>
Cc: stable@xxxxxxxxxxxxxxx
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 12 ++++++++++++
1 file changed, 12 insertions(+)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
@@ -2220,6 +2220,10 @@ static int amdgpu_device_ip_init(struct
if (r)
goto init_failed;
+ r = amdgpu_amdkfd_resume_iommu(adev);
+ if (r)
+ goto init_failed;
+
r = amdgpu_device_ip_hw_init_phase1(adev);
if (r)
goto init_failed;
@@ -2913,6 +2917,10 @@ static int amdgpu_device_ip_resume(struc
{
int r;
+ r = amdgpu_amdkfd_resume_iommu(adev);
+ if (r)
+ return r;
+
r = amdgpu_device_ip_resume_phase1(adev);
if (r)
return r;
@@ -4296,6 +4304,10 @@ static int amdgpu_do_asic_reset(struct a
if (!r) {
dev_info(tmp_adev->dev, "GPU reset succeeded, trying to resume\n");
+ r = amdgpu_amdkfd_resume_iommu(tmp_adev);
+ if (r)
+ goto out;
+
r = amdgpu_device_ip_resume_phase1(tmp_adev);
if (r)
goto out;
Patches currently in stable-queue which might be from James.Zhu@xxxxxxx are
queue-5.10/drm-amd-amdkfd-adjust-dummy-functions-placement.patch
queue-5.10/drm-amdgpu-add-amdgpu_amdkfd_resume_iommu.patch
queue-5.10/drm-amdgpu-init-iommu-after-amdkfd-device-init.patch
queue-5.10/drm-amdkfd-separate-kfd_iommu_resume-from-kfd_resume.patch
queue-5.10/drm-amdkfd-fix-boot-failure-when-iommu-is-disabled-in-picasso.patch
queue-5.10/drm-amdgpu-move-iommu_resume-before-ip-init-resume.patch
