[PATCH 46/66] drm/amdgpu/pm/amdgpu_smu: convert more IP version checking

[Deucher, Alexander]

[Public]

Fixed locally.
________________________________
From: Lazar, Lijo <Lijo.Lazar at amd.com>
Sent: Wednesday, September 22, 2021 4:16 AM
To: Deucher, Alexander <Alexander.Deucher at amd.com>; amd-gfx at lists.freedesktop.org <amd-gfx at lists.freedesktop.org>
Subject: Re: [PATCH 46/66] drm/amdgpu/pm/amdgpu_smu: convert more IP version checking



On 9/21/2021 11:37 PM, Alex Deucher wrote:
> Use IP versions rather than asic_type to differentiate
> IP version specific features.
>
> Signed-off-by: Alex Deucher <alexander.deucher at amd.com>
> ---
>   drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c | 41 ++++++++++-------------
>   1 file changed, 18 insertions(+), 23 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c b/drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c
> index 5f372d353d9d..150cac4ea75c 100644
> --- a/drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c
> +++ b/drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c
> @@ -455,8 +455,7 @@ static int smu_get_power_num_states(void *handle,
>
>   bool is_support_sw_smu(struct amdgpu_device *adev)
>   {
> -     if ((adev->asic_type >= CHIP_ARCTURUS) ||
> -         (adev->ip_versions[MP1_HWIP] >= IP_VERSION(11, 0, 0)))
> +     if (adev->ip_versions[MP1_HWIP] >= IP_VERSION(11, 0, 0))
>                return true;
>
>        return false;
> @@ -600,23 +599,19 @@ static int smu_set_funcs(struct amdgpu_device *adev)
>        case IP_VERSION(11, 0, 8):
>                cyan_skillfish_set_ppt_funcs(smu);
>                break;
> -     default:
> -             switch (adev->asic_type) {
> -             case CHIP_ARCTURUS:
> -                     adev->pm.pp_feature &= ~PP_GFXOFF_MASK;
> -                     arcturus_set_ppt_funcs(smu);
> -                     /* OD is not supported on Arcturus */
> -                     smu->od_enabled =false;
> -                     break;
> -             case CHIP_ALDEBARAN:
> -                     aldebaran_set_ppt_funcs(smu);
> -                     /* Enable pp_od_clk_voltage node */
> -                     smu->od_enabled = true;
> -                     break;
> -             default:
> -                     return -EINVAL;
> -             }
> +     case IP_VERSION(11, 0, 2):
> +             adev->pm.pp_feature &= ~PP_GFXOFF_MASK;
> +             arcturus_set_ppt_funcs(smu);
> +             /* OD is not supported on Arcturus */
> +             smu->od_enabled =false;
> +             break;
> +     case IP_VERSION(13, 0, 2):
> +             aldebaran_set_ppt_funcs(smu);
> +             /* Enable pp_od_clk_voltage node */
> +             smu->od_enabled = true;
>                break;
> +     default:
> +             return -EINVAL;
>        }
>
>        return 0;
> @@ -2288,11 +2283,11 @@ int smu_get_power_limit(void *handle,
>        } else {
>                switch (limit_level) {
>                case SMU_PPT_LIMIT_CURRENT:
> -                     if ((smu->adev->asic_type == CHIP_ALDEBARAN) ||
> -                          (adev->ip_versions[MP1_HWIP] == IP_VERSION(11, 0, 7)) ||
> -                          (adev->ip_versions[MP1_HWIP] == IP_VERSION(11, 0, 11)) ||
> -                          (adev->ip_versions[MP1_HWIP] == IP_VERSION(11, 0, 12)) ||
> -                          (adev->ip_versions[MP1_HWIP] == IP_VERSION(11, 0, 13)))
> +                     if ((adev->ip_versions[MP1_HWIP] == IP_VERSION(13, 0, 2)) ||
> +                         (adev->ip_versions[MP1_HWIP] == IP_VERSION(11, 0, 7)) ||
> +                         (adev->ip_versions[MP1_HWIP] == IP_VERSION(11, 0, 11)) ||
> +                         (adev->ip_versions[MP1_HWIP] == IP_VERSION(11, 0, 12)) ||
> +                         (adev->ip_versions[MP1_HWIP] == IP_VERSION(11, 0, 13)))

Maybe seen/commented before, anyway switch...case

Thanks,
Lijo

>                                ret = smu_get_asic_power_limits(smu,
>                                                                &smu->current_power_limit,
>                                                                NULL,
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.freedesktop.org/archives/amd-gfx/attachments/20210922/afd8632a/attachment.htm>