[PATCH 3/3] drm/amdgpu/psp: add some missing cases to psp_check_pmfw_centralized_cstate_management

[Alex Deucher]

On Wed, Oct 13, 2021 at 10:29 PM Quan, Evan <Evan.Quan at amd.com> wrote:
>
> [AMD Official Use Only]
>
>
>
> > -----Original Message-----
> > From: Alex Deucher <alexdeucher at gmail.com>
> > Sent: Thursday, October 14, 2021 10:00 AM
> > To: Quan, Evan <Evan.Quan at amd.com>
> > Cc: Deucher, Alexander <Alexander.Deucher at amd.com>; amd-
> > gfx at lists.freedesktop.org
> > Subject: Re: [PATCH 3/3] drm/amdgpu/psp: add some missing cases to
> > psp_check_pmfw_centralized_cstate_management
> >
> > On Wed, Oct 13, 2021 at 9:41 PM Quan, Evan <Evan.Quan at amd.com> wrote:
> > >
> > > [AMD Official Use Only]
> > >
> > > I assume IP_VERSION(11, 0, 0) and IP_VERSION(11, 0, 5) are for Navi10 and
> > Navi14 respectively.
> > > Then according to the code comment that "
> > pmfw_centralized_cstate_management support is available for Navi12 and
> > onwards only", I think they should be handled by "default" branch. That
> > means this patch seems unnecessary.
> > >
> >
> > The original code was this:
> >        if ((adev->asic_type >= CHIP_ARCTURUS) ||
> >            (adev->asic_type >= CHIP_NAVI12))
> >                 psp->pmfw_centralized_cstate_management = true; So navi10 and
> > 14 were included.  Not sure whether they should have been or not.
> [Quan, Evan] OK. That will make sense. Series is reviewed-by: Evan Quan <evan.quan at amd.com>
> Dig a little more about the history.
> It seems at first the centralized_cstate_management was limited to ARCTURUS or >= CHIP_NAIV12. Then it was expanded to all ASICs >= CHIP_ ARCTURUS.
> But the code comment was left outdated. Can you get that updated on code submit?
> @@ -65,7 +65,6 @@ static int psp_securedisplay_terminate(struct psp_context *psp);
>   *
>   * This new sequence is required for
>   *   - Arcturus and onwards
> - *   - Navi12 and onwards
>   */

Will do.  Thanks!

Alex


>
> BR
> Evan
> >
> > Alex
> >
> >
> > > Patch1 and 2 are reviewed-by: Evan Quan <evan.quan at amd.com>
> > >
> > > > -----Original Message-----
> > > > From: amd-gfx <amd-gfx-bounces at lists.freedesktop.org> On Behalf Of
> > > > Alex Deucher
> > > > Sent: Tuesday, October 12, 2021 11:53 PM
> > > > To: amd-gfx at lists.freedesktop.org
> > > > Cc: Deucher, Alexander <Alexander.Deucher at amd.com>
> > > > Subject: [PATCH 3/3] drm/amdgpu/psp: add some missing cases to
> > > > psp_check_pmfw_centralized_cstate_management
> > > >
> > > > Missed a few asics.
> > > >
> > > > Fixes: 82d05736c47b19 ("drm/amdgpu/amdgpu_psp: convert to IP
> > version
> > > > checking")
> > > > Signed-off-by: Alex Deucher <alexander.deucher at amd.com>
> > > > ---
> > > >  drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c | 2 ++
> > > >  1 file changed, 2 insertions(+)
> > > >
> > > > diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c
> > > > b/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c
> > > > index 6b39e6c02dd8..51620f2fc43a 100644
> > > > --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c
> > > > +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c
> > > > @@ -77,7 +77,9 @@ static void
> > > > psp_check_pmfw_centralized_cstate_management(struct psp_context
> > *psp
> > > >       }
> > > >
> > > >       switch (adev->ip_versions[MP0_HWIP][0]) {
> > > > +     case IP_VERSION(11, 0, 0):
> > > >       case IP_VERSION(11, 0, 4):
> > > > +     case IP_VERSION(11, 0, 5):
> > > >       case IP_VERSION(11, 0, 7):
> > > >       case IP_VERSION(11, 0, 9):
> > > >       case IP_VERSION(11, 0, 11):
> > > > --
> > > > 2.31.1