These patches are back port for 5.10 and 5.12 stable. They are cherry-picked from 5.14 stable and has some conflict fix. BugFix: https://bugzilla.kernel.org/show_bug.cgi?id=211277 James Zhu (3): drm/amdkfd: separate kfd_iommu_resume from kfd_resume drm/amdgpu: add amdgpu_amdkfd_resume_iommu drm/amdgpu: move iommu_resume before ip init/resume Yifan Zhang (2): drm/amdgpu: init iommu after amdkfd device init drm/amdkfd: fix boot failure when iommu is disabled in Picasso. drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c | 10 ++++++++++ drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.h | 2 ++ drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 8 ++++++++ drivers/gpu/drm/amd/amdkfd/kfd_device.c | 15 +++++++++++---- 4 files changed, 31 insertions(+), 4 deletions(-) -- 2.7.4
