On Fri, Dec 03, 2021 at 12:27:27PM -0500, James Zhu wrote: > 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 > This patch series is causing build errors as reported in numerous places: https://lore.kernel.org/r/4a881261-ba90-2095-58df-13dcffe6bcf2@xxxxxxxxxxxx https://lore.kernel.org/r/bd0bddb3-8fa7-dc8e-d205-5c266e98d8b9@xxxxxxxxxx https://lore.kernel.org/r/CA+G9fYtYmZY-m1ZCaF3qJeGtn=8CJR_4K8EB_T4W+wuh31CNjg@xxxxxxxxxxxxxx so I am going to drop them all from the tree now. Please fix up and resend if you want them in the 5.10.y kernel tree. thanks, greg k-h