On Tue, Nov 2, 2021 at 3:23 PM James Zhu <James.Zhu@amd.com> wrote:
>
> To revert wrong merge during rebase.
> This reverts commit afd18180c07026f94a80ff024acef5f4159084a4.

Missing your signed-off-by.  Might be better to just merge these two
patches into one unless they are individually applicable to different
kernels (e.g., 5.15 vs drm-next).  Also these will probably fix the
following:
Bug: https://nam11.safelinks.protection.outlook.com/?url=https%3A%2F%2Fbugzilla.kernel.org%2Fshow_bug.cgi%3Fid%3D214859&amp;data=04%7C01%7CJames.Zhu%40amd.com%7Cd89a2e71a6204428008908d99e40368f%7C3dd8961fe4884e608e11a82d994e183d%7C0%7C0%7C637714820908943450%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C1000&amp;sdata=wOmavKInLZrl3Qge2N83kgMh2dATo4aUH%2BW6QrPvL30%3D&amp;reserved=0
Bug: https://nam11.safelinks.protection.outlook.com/?url=https%3A%2F%2Fgitlab.freedesktop.org%2Fdrm%2Famd%2F-%2Fissues%2F1770&amp;data=04%7C01%7CJames.Zhu%40amd.com%7Cd89a2e71a6204428008908d99e40368f%7C3dd8961fe4884e608e11a82d994e183d%7C0%7C0%7C637714820908943450%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C1000&amp;sdata=k3GJBSFKw8FJhGs9Urpm8PmFPzN7m0LFl5p7Wv1FfGY%3D&amp;reserved=0

Alex

> ---
>  drivers/gpu/drm/amd/amdkfd/kfd_device.c | 3 ---
>  1 file changed, 3 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_device.c b/drivers/gpu/drm/amd/amdkfd/kfd_device.c
> index 7677ced16a27..be26c4016ade 100644
> --- a/drivers/gpu/drm/amd/amdkfd/kfd_device.c
> +++ b/drivers/gpu/drm/amd/amdkfd/kfd_device.c
> @@ -1031,9 +1031,6 @@ bool kgd2kfd_device_init(struct kfd_dev *kfd,
>
>         svm_migrate_init(kfd->adev);
>
> -       if(kgd2kfd_resume_iommu(kfd))
> -               goto device_iommu_error;
> -
>         if (kfd_resume(kfd))
>                 goto kfd_resume_error;
>
> --
> 2.25.1
>