[PATCH] drm/amdgpu: remove duplicated kfd_resume_iommu

[Ken Moffat]

On Tue, Nov 02, 2021 at 10:01:46PM -0400, Alex Deucher wrote:
> On Tue, Nov 2, 2021 at 9:34 PM James Zhu <James.Zhu at amd.com>
> wrote:
> >
> > Remove duplicated kfd_resume_iommu which already runs in
> > mdgpu_amdkfd_device_init.
> >
> > Signed-off-by: James Zhu <James.Zhu at amd.com>
> 
> Once you get confirmation, please add: Bug:
> https://bugzilla.kernel.org/show_bug.cgi?id=214859 Bug:
> https://gitlab.freedesktop.org/drm/amd/-/issues/1770
> 
> Acked-by: Alex Deucher <alexander.deucher at amd.com>
> 
> 
I see those were both for 5.14.15, on my 5.14 kernels I have not
moved beyond 5.14.12 so I've dodged the bullet on those.  And on my
2500u which I think is a Raven, 5.15.0-rc7 was ok.

On the picasso, this applies to 5.15.0 with an offset of 34 lines
(no fuzz) and solves the problem.  Thanks.

If it is any use,

Tested-By: Ken Moffat <zarniwhoop at ntlworld.com>

> > ---
> >  drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 4 ----
> >  1 file changed, 4 deletions(-)
> >
> > diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
> > index e56bc925afcf..f77823ce7ae8 100644
> > --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
> > +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
> > @@ -2398,10 +2398,6 @@ static int amdgpu_device_ip_init(struct amdgpu_device *adev)
> >         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:
> > --
> > 2.25.1
> >

-- 
Vetinari smiled. "Can you keep a secret, Mister Lipwig?"
"Oh, yes, sir. I've kept lots."
"Capital. And the point is, so can I. You do not need to know.”