[PATCH] drm/amd/pm: Update intermediate power state for SI

[Alex Deucher]

On Thu, Sep 23, 2021 at 9:04 AM Lazar, Lijo <Lijo.Lazar at amd.com> wrote:
>
> [AMD Official Use Only]
>
> Hi Alex,
>
> "Fixes" tag - I interpret it as fixes some broken logic in the earlier patch. This one doesn't fix f9b7f3703ff9 ("drm/amdgpu/acpi: make ATPX/ATCS structures global (v2)"). That patch's logic works well and is fine as it is.
>
> May be add a reference or some more details in the comments?

yeah, probably skip that fixes tag.  I suspect this bug was there from
when dpm support was first added for SI if you want to dig up that
commit, otherwise, I can just send it out for stable as is with the
bug reference.

Alex


>
> Thanks,
> Lijo
>
> -----Original Message-----
> From: Alex Deucher <alexdeucher at gmail.com>
> Sent: Thursday, September 23, 2021 6:21 PM
> To: Lazar, Lijo <Lijo.Lazar at amd.com>
> Cc: amd-gfx list <amd-gfx at lists.freedesktop.org>; Deucher, Alexander <Alexander.Deucher at amd.com>; Zhang, Hawking <Hawking.Zhang at amd.com>; Wang, Yang(Kevin) <KevinYang.Wang at amd.com>; Feng, Kenneth <Kenneth.Feng at amd.com>; Quan, Evan <Evan.Quan at amd.com>
> Subject: Re: [PATCH] drm/amd/pm: Update intermediate power state for SI
>
> Acked-by: Alex Deucher <alexander.deucher at amd.com>
> Fixes: f9b7f3703ff9 ("drm/amdgpu/acpi: make ATPX/ATCS structures global (v2)")
>
> Thanks!
>
> On Thu, Sep 23, 2021 at 12:30 AM Lijo Lazar <lijo.lazar at amd.com> wrote:
> >
> > Update the current state as boot state during dpm initialization.
> > During the subsequent initialization, set_power_state gets called to
> > transition to the final power state. set_power_state refers to values
> > from the current state and without current state populated, it could
> > result in NULL pointer dereference.
> >
> > Bug:https://nam11.safelinks.protection.outlook.com/?url=https%3A%2F%2F
> > gitlab.freedesktop.org%2Fdrm%2Famd%2F-%2Fissues%2F1698&data=04%7C0
> > 1%7Clijo.lazar%40amd.com%7C8a10ba2a0d7d4896ed1408d97e90d3cc%7C3dd8961f
> > e4884e608e11a82d994e183d%7C0%7C0%7C637679982775776349%7CUnknown%7CTWFp
> > bGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn
> > 0%3D%7C1000&sdata=gTpG97DwoTSYBTN%2BSZYiAAL4o1VjG5n%2BaHu65s%2BADG
> > E%3D&reserved=0
> >
> > Signed-off-by: Lijo Lazar <lijo.lazar at amd.com>
> > ---
> >  drivers/gpu/drm/amd/pm/powerplay/si_dpm.c | 2 ++
> >  1 file changed, 2 insertions(+)
> >
> > diff --git a/drivers/gpu/drm/amd/pm/powerplay/si_dpm.c
> > b/drivers/gpu/drm/amd/pm/powerplay/si_dpm.c
> > index bdbbeb959c68..81f82aa05ec2 100644
> > --- a/drivers/gpu/drm/amd/pm/powerplay/si_dpm.c
> > +++ b/drivers/gpu/drm/amd/pm/powerplay/si_dpm.c
> > @@ -6867,6 +6867,8 @@ static int si_dpm_enable(struct amdgpu_device *adev)
> >         si_enable_auto_throttle_source(adev, AMDGPU_DPM_AUTO_THROTTLE_SRC_THERMAL, true);
> >         si_thermal_start_thermal_controller(adev);
> >
> > +       ni_update_current_ps(adev, boot_ps);
> > +
> >         return 0;
> >  }
> >
> > --
> > 2.17.1
> >