[PATCH] drm/amd/powerplay: revise Vega20 pptable version check

Alex Deucher alexdeucher at gmail.com
Tue Oct 30 01:41:54 UTC 2018


On Mon, Oct 29, 2018 at 9:39 PM Evan Quan <evan.quan at amd.com> wrote:
>
> Tell the version numbers when the pptable versions do not match.
>
> Change-Id: I3ea8aac7493927281b14d28866fa87690621f0f0
> Signed-off-by: Evan Quan <evan.quan at amd.com>
> ---
>  .../drm/amd/powerplay/hwmgr/vega20_processpptables.c   | 10 ++++++++--
>  1 file changed, 8 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/powerplay/hwmgr/vega20_processpptables.c b/drivers/gpu/drm/amd/powerplay/hwmgr/vega20_processpptables.c
> index 5eca2b7c78d5..8e70e806f639 100644
> --- a/drivers/gpu/drm/amd/powerplay/hwmgr/vega20_processpptables.c
> +++ b/drivers/gpu/drm/amd/powerplay/hwmgr/vega20_processpptables.c
> @@ -642,8 +642,14 @@ static int check_powerplay_tables(
>                 "Unsupported PPTable format!", return -1);
>         PP_ASSERT_WITH_CODE(powerplay_table->sHeader.structuresize > 0,
>                 "Invalid PowerPlay Table!", return -1);
> -       PP_ASSERT_WITH_CODE(powerplay_table->smcPPTable.Version == PPTABLE_V20_SMU_VERSION,
> -               "Unmatch PPTable version, vbios update may be needed!", return -1);
> +
> +       if (powerplay_table->smcPPTable.Version != PPTABLE_V20_SMU_VERSION) {
> +               pr_info("Unmatch PPTable version: "
> +                       "pptable from VBIOS is V%d while driver supported is V%d!",
> +                       powerplay_table->smcPPTable.Version,
> +                       PPTABLE_V20_SMU_VERSION);
> +               return -1;

Return a proper error codes here.  E.g., -EINVAL.  With that fixed:
Reviewed-by: Alex Deucher <alexander.deucher at amd.com>

> +       }
>
>         //dump_pptable(&powerplay_table->smcPPTable);
>
> --
> 2.19.1
>
> _______________________________________________
> amd-gfx mailing list
> amd-gfx at lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/amd-gfx


More information about the amd-gfx mailing list