[PATCH] drm/amd/pm: early return if disabling DPMS for GFX IP v11.5.2

[Alex Deucher]

On Sun, Jul 14, 2024 at 11:40 PM Tim Huang <tim.huang at amd.com> wrote:
>
> This was intended to add support for GFX IP v11.5.2, but it needs
> to be applied to all GFX11 and subsequent APUs. Therefore the code
> should be revised to accommodate this.
>
> Signed-off-by: Tim Huang <tim.huang at amd.com>

Acked-by: Alex Deucher <alexander.deucher at amd.com>

> ---
>  drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c | 16 ++++------------
>  1 file changed, 4 insertions(+), 12 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c b/drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c
> index d79bdb1e8cdf..06684e29db23 100644
> --- a/drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c
> +++ b/drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c
> @@ -1922,20 +1922,12 @@ static int smu_disable_dpms(struct smu_context *smu)
>         }
>
>         /*
> -        * For SMU 13.0.4/11 and 14.0.0, PMFW will handle the features disablement properly
> +        * For GFX11 and subsequent APUs, PMFW will handle the features disablement properly
>          * for gpu reset and S0i3 cases. Driver involvement is unnecessary.
>          */
> -       if (amdgpu_in_reset(adev) || adev->in_s0ix) {
> -               switch (amdgpu_ip_version(adev, MP1_HWIP, 0)) {
> -               case IP_VERSION(13, 0, 4):
> -               case IP_VERSION(13, 0, 11):
> -               case IP_VERSION(14, 0, 0):
> -               case IP_VERSION(14, 0, 1):
> -                       return 0;
> -               default:
> -                       break;
> -               }
> -       }
> +       if (IP_VERSION_MAJ(amdgpu_ip_version(adev, GC_HWIP, 0)) >= 11 &&
> +           smu->is_apu && (amdgpu_in_reset(adev) || adev->in_s0ix))
> +               return 0;
>
>         /*
>          * For gpu reset, runpm and hibernation through BACO,
> --
> 2.43.0
>