This is a note to let you know that I've just added the patch titled drm/amdkfd: fix boot failure when iommu is disabled in Picasso. to the 5.15-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-amdkfd-fix-boot-failure-when-iommu-is-disabled-in-picasso.patch and it can be found in the queue-5.15 subdirectory. If you, or anyone else, feels it should not be added to the stable tree, please let <stable@xxxxxxxxxxxxxxx> know about it. >From afd18180c07026f94a80ff024acef5f4159084a4 Mon Sep 17 00:00:00 2001 From: Yifan Zhang <yifan1.zhang@xxxxxxx> 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@xxxxxxx> 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@xxxxxxxxx> Tested-by: youling <youling257@xxxxxxxxx> Signed-off-by: Yifan Zhang <yifan1.zhang@xxxxxxx> Reviewed-by: James Zhu <James.Zhu@xxxxxxx> Signed-off-by: Alex Deucher <alexander.deucher@xxxxxxx> Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx> --- 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; Patches currently in stable-queue which might be from yifan1.zhang@xxxxxxx are queue-5.15/drm-amdkfd-fix-boot-failure-when-iommu-is-disabled-in-picasso.patch