[PATCH] drm/amdgpu/renoir: move gfxoff handling into gfx9 module

[Alex Deucher]

Ping?

On Tue, Oct 29, 2019 at 4:10 PM Alex Deucher <alexdeucher at gmail.com> wrote:
>
> To properly handle the option parsing ordering.
>
> Signed-off-by: Alex Deucher <alexander.deucher at amd.com>
> ---
>  drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c | 6 ++++++
>  drivers/gpu/drm/amd/amdgpu/soc15.c    | 5 -----
>  2 files changed, 6 insertions(+), 5 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c b/drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c
> index 9fe95e7693d5..b2b3eb75c48c 100644
> --- a/drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c
> +++ b/drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c
> @@ -1051,6 +1051,12 @@ static void gfx_v9_0_check_if_need_gfxoff(struct amdgpu_device *adev)
>                             !adev->gfx.rlc.is_rlc_v2_1))
>                         adev->pm.pp_feature &= ~PP_GFXOFF_MASK;
>
> +               if (adev->pm.pp_feature & PP_GFXOFF_MASK)
> +                       adev->pg_flags |= AMD_PG_SUPPORT_GFX_PG |
> +                               AMD_PG_SUPPORT_CP |
> +                               AMD_PG_SUPPORT_RLC_SMU_HS;
> +               break;
> +       case CHIP_RENOIR:
>                 if (adev->pm.pp_feature & PP_GFXOFF_MASK)
>                         adev->pg_flags |= AMD_PG_SUPPORT_GFX_PG |
>                                 AMD_PG_SUPPORT_CP |
> diff --git a/drivers/gpu/drm/amd/amdgpu/soc15.c b/drivers/gpu/drm/amd/amdgpu/soc15.c
> index 16c5bb75889f..25e69ea74a41 100644
> --- a/drivers/gpu/drm/amd/amdgpu/soc15.c
> +++ b/drivers/gpu/drm/amd/amdgpu/soc15.c
> @@ -1263,11 +1263,6 @@ static int soc15_common_early_init(void *handle)
>                                  AMD_PG_SUPPORT_VCN |
>                                  AMD_PG_SUPPORT_VCN_DPG;
>                 adev->external_rev_id = adev->rev_id + 0x91;
> -
> -               if (adev->pm.pp_feature & PP_GFXOFF_MASK)
> -                       adev->pg_flags |= AMD_PG_SUPPORT_GFX_PG |
> -                               AMD_PG_SUPPORT_CP |
> -                               AMD_PG_SUPPORT_RLC_SMU_HS;
>                 break;
>         default:
>                 /* FIXME: not supported yet */
> --
> 2.23.0
>