[PATCH] drm/amdgpu/swsmu: don't bail early on hw_setup on resume

[Alex Deucher]

Looks like RN is immune due to the way it's is_dpm_running function is
implemented.  Maybe something like this is a better solution:
https://patchwork.freedesktop.org/patch/426293/

Alex

On Fri, Mar 26, 2021 at 10:12 AM Deucher, Alexander
<Alexander.Deucher at amd.com> wrote:
>
> [AMD Official Use Only - Internal Distribution Only]
>
>
> Can someone double check this on RN/CZN with S3 and S0ix?
>
> Alex
>
> ________________________________
> From: Liu, Zhan <Zhan.Liu at amd.com>
> Sent: Friday, March 26, 2021 1:46 AM
> To: Deucher, Alexander <Alexander.Deucher at amd.com>; amd-gfx at lists.freedesktop.org <amd-gfx at lists.freedesktop.org>
> Cc: Deucher, Alexander <Alexander.Deucher at amd.com>
> Subject: RE: [PATCH] drm/amdgpu/swsmu: don't bail early on hw_setup on resume
>
> [AMD Official Use Only - Internal Distribution Only]
>
> > -----Original Message-----
> > From: amd-gfx <amd-gfx-bounces at lists.freedesktop.org> On Behalf Of Alex
> > Deucher
> > Sent: 2021/March/26, Friday 12:38 AM
> > To: amd-gfx at lists.freedesktop.org
> > Cc: Deucher, Alexander <Alexander.Deucher at amd.com>
> > Subject: [PATCH] drm/amdgpu/swsmu: don't bail early on hw_setup on
> > resume
> >
> > The SMU comes back up with DPM enabled by the sbios, but the driver still
> > has to set up the SMU/driver mailbox, etc.
> >
> > Signed-off-by: Alex Deucher <alexander.deucher at amd.com>
>
> Reviewed-by: Zhan Liu <zhan.liu at amd.com>
>
> > ---
> >  drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c | 2 +-
> >  1 file changed, 1 insertion(+), 1 deletion(-)
> >
> > diff --git a/drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c
> > b/drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c
> > index d4b804c7b986..462917d4d5e2 100644
> > --- a/drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c
> > +++ b/drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c
> > @@ -1102,7 +1102,7 @@ static int smu_smc_hw_setup(struct smu_context
> > *smu)
> >  uint32_t pcie_gen = 0, pcie_width = 0;
> >  int ret = 0;
> >
> > -if (adev->in_suspend && smu_is_dpm_running(smu)) {
> > +if (!smu->is_apu && adev->in_suspend &&
> > smu_is_dpm_running(smu)) {
> >  dev_info(adev->dev, "dpm has been enabled\n");
> >  /* this is needed specifically */
> >  if ((adev->asic_type >= CHIP_SIENNA_CICHLID) &&
> > --
> > 2.30.2
> >
> > _______________________________________________
> > amd-gfx mailing list
> > amd-gfx at lists.freedesktop.org
> > https://nam11.safelinks.protection.outlook.com/?url=https%3A%2F%2Flists.
> > freedesktop.org%2Fmailman%2Flistinfo%2Famd-
> > gfx&data=04%7C01%7Czhan.liu%40amd.com%7C500744d08f7946b2c5d
> > e08d8f010ec49%7C3dd8961fe4884e608e11a82d994e183d%7C0%7C0%7C6375
> > 23302768646367%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiL
> > CJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C1000&sdata=vN
> > JawxwfojJrxNOG5L8Y2BAWpGRRN6valpk6y00XIQw%3D&reserved=0
> _______________________________________________
> amd-gfx mailing list
> amd-gfx at lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/amd-gfx