[PATCH] drm/amdgpu: Enable gpu reset for S3 abort cases on Raven series

[Liang, Prike]

[AMD Official Use Only - General]

> From: Alex Deucher <alexdeucher at gmail.com>
> Sent: Friday, February 23, 2024 1:03 AM
> To: Liang, Prike <Prike.Liang at amd.com>
> Cc: amd-gfx at lists.freedesktop.org; Deucher, Alexander
> <Alexander.Deucher at amd.com>
> Subject: Re: [PATCH] drm/amdgpu: Enable gpu reset for S3 abort cases on
> Raven series
>
> On Thu, Feb 22, 2024 at 8:41 AM Prike Liang <Prike.Liang at amd.com> wrote:
> >
> > Currently, GPU resets can now be performed successfully on the Raven
> > series. While GPU reset is required for the S3 suspend abort case.
> > So now can enable gpu reset for S3 abort cases on the Raven series.
> >
> > Signed-off-by: Prike Liang <Prike.Liang at amd.com>
> > ---
> >  drivers/gpu/drm/amd/amdgpu/soc15.c | 45
> > +++++++++++++++++-------------
> >  1 file changed, 25 insertions(+), 20 deletions(-)
> >
> > diff --git a/drivers/gpu/drm/amd/amdgpu/soc15.c
> > b/drivers/gpu/drm/amd/amdgpu/soc15.c
> > index e4012f53632b..f68ef0863cb0 100644
> > --- a/drivers/gpu/drm/amd/amdgpu/soc15.c
> > +++ b/drivers/gpu/drm/amd/amdgpu/soc15.c
> > @@ -574,11 +574,34 @@ soc15_asic_reset_method(struct amdgpu_device
> *adev)
> >                 return AMD_RESET_METHOD_MODE1;  }
> >
> > +static bool soc15_need_reset_on_resume(struct amdgpu_device *adev) {
> > +       u32 sol_reg;
> > +
> > +       sol_reg = RREG32_SOC15(MP0, 0, mmMP0_SMN_C2PMSG_81);
> > +
> > +       /* Will reset for the following suspend abort cases.
> > +        * 1) Only reset limit on APU side, dGPU hasn't checked yet.
> > +        * 2) S3 suspend abort and TOS already launched.
> > +        */
> > +       if (adev->flags & AMD_IS_APU && adev->in_s3 &&
> > +                       !adev->suspend_complete &&
> > +                       sol_reg)
> > +               return true;
> > +
> > +       return false;
> > +}
> > +
> >  static int soc15_asic_reset(struct amdgpu_device *adev)  {
> >         /* original raven doesn't have full asic reset */
> > -       if ((adev->apu_flags & AMD_APU_IS_RAVEN) ||
> > -           (adev->apu_flags & AMD_APU_IS_RAVEN2))
> > +       /* On the latest Raven, the GPU reset can be performed
> > +        * successfully. So now, temporarily enable it for the
> > +        * S3 suspend abort case.
> > +        */
> > +       if (!soc15_need_reset_on_resume(adev) &&
> > +                       ((adev->apu_flags & AMD_APU_IS_RAVEN) ||
> > +           (adev->apu_flags & AMD_APU_IS_RAVEN2)))
>
> Maybe check the apu flags first to avoid the MMIO read on chips where we
> don't need it.
>
> Alex
>
Yes, it's a good idea and will address it at next patch version.

> >                 return 0;
> >
> >         switch (soc15_asic_reset_method(adev)) { @@ -1298,24 +1321,6
> > @@ static int soc15_common_suspend(void *handle)
> >         return soc15_common_hw_fini(adev);  }
> >
> > -static bool soc15_need_reset_on_resume(struct amdgpu_device *adev) -{
> > -       u32 sol_reg;
> > -
> > -       sol_reg = RREG32_SOC15(MP0, 0, mmMP0_SMN_C2PMSG_81);
> > -
> > -       /* Will reset for the following suspend abort cases.
> > -        * 1) Only reset limit on APU side, dGPU hasn't checked yet.
> > -        * 2) S3 suspend abort and TOS already launched.
> > -        */
> > -       if (adev->flags & AMD_IS_APU && adev->in_s3 &&
> > -                       !adev->suspend_complete &&
> > -                       sol_reg)
> > -               return true;
> > -
> > -       return false;
> > -}
> > -
> >  static int soc15_common_resume(void *handle)  {
> >         struct amdgpu_device *adev = (struct amdgpu_device *)handle;
> > --
> > 2.34.1
> >