On Thu, Oct 24, 2024 at 10:36 PM <boyuan.zhang@xxxxxxx> wrote:
>
> From: Boyuan Zhang <boyuan.zhang@xxxxxxx>
>
> Add an instance parameter to the existing function dpm_set_vcn_enable()
> for future implementation. Re-write all pptable functions accordingly.
>
> v2: Remove duplicated dpm_set_vcn_enable() functions in v1. Instead,
> adding instance parameter to existing functions.
>
> Signed-off-by: Boyuan Zhang <boyuan.zhang@xxxxxxx>
> Suggested-by: Christian König <christian.koenig@xxxxxxx>
> Suggested-by: Alex Deucher <alexander.deucher@xxxxxxx>
> Acked-by: Christian König <christian.koenig@xxxxxxx>
Reviewed-by: Alex Deucher <alexander.deucher@xxxxxxx>
> ---
> drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c | 2 +-
> drivers/gpu/drm/amd/pm/swsmu/inc/amdgpu_smu.h | 2 +-
> drivers/gpu/drm/amd/pm/swsmu/inc/smu_v13_0.h | 3 ++-
> drivers/gpu/drm/amd/pm/swsmu/inc/smu_v14_0.h | 3 ++-
> drivers/gpu/drm/amd/pm/swsmu/smu11/arcturus_ppt.c | 4 +++-
> drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c | 4 +++-
> drivers/gpu/drm/amd/pm/swsmu/smu11/sienna_cichlid_ppt.c | 4 +++-
> drivers/gpu/drm/amd/pm/swsmu/smu11/vangogh_ppt.c | 4 +++-
> drivers/gpu/drm/amd/pm/swsmu/smu12/renoir_ppt.c | 4 +++-
> drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0.c | 3 ++-
> drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_5_ppt.c | 4 +++-
> drivers/gpu/drm/amd/pm/swsmu/smu13/yellow_carp_ppt.c | 4 +++-
> drivers/gpu/drm/amd/pm/swsmu/smu14/smu_v14_0.c | 3 ++-
> 13 files changed, 31 insertions(+), 13 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c b/drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c
> index 8d4aee4e2287..fe2a740766a2 100644
> --- a/drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c
> +++ b/drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c
> @@ -252,7 +252,7 @@ static int smu_dpm_set_vcn_enable(struct smu_context *smu,
> if (atomic_read(&power_gate->vcn_gated) ^ enable)
> return 0;
>
> - ret = smu->ppt_funcs->dpm_set_vcn_enable(smu, enable);
> + ret = smu->ppt_funcs->dpm_set_vcn_enable(smu, enable, 0xff);
> if (!ret)
> atomic_set(&power_gate->vcn_gated, !enable);
>
> diff --git a/drivers/gpu/drm/amd/pm/swsmu/inc/amdgpu_smu.h b/drivers/gpu/drm/amd/pm/swsmu/inc/amdgpu_smu.h
> index 8bb32b3f0d9c..4ebcc1e53ea2 100644
> --- a/drivers/gpu/drm/amd/pm/swsmu/inc/amdgpu_smu.h
> +++ b/drivers/gpu/drm/amd/pm/swsmu/inc/amdgpu_smu.h
> @@ -739,7 +739,7 @@ struct pptable_funcs {
> * @dpm_set_vcn_enable: Enable/disable VCN engine dynamic power
> * management.
> */
> - int (*dpm_set_vcn_enable)(struct smu_context *smu, bool enable);
> + int (*dpm_set_vcn_enable)(struct smu_context *smu, bool enable, int inst);
>
> /**
> * @dpm_set_jpeg_enable: Enable/disable JPEG engine dynamic power
> diff --git a/drivers/gpu/drm/amd/pm/swsmu/inc/smu_v13_0.h b/drivers/gpu/drm/amd/pm/swsmu/inc/smu_v13_0.h
> index 044d6893b43e..ae3563d71fa0 100644
> --- a/drivers/gpu/drm/amd/pm/swsmu/inc/smu_v13_0.h
> +++ b/drivers/gpu/drm/amd/pm/swsmu/inc/smu_v13_0.h
> @@ -255,7 +255,8 @@ int smu_v13_0_wait_for_event(struct smu_context *smu, enum smu_event_type event,
> uint64_t event_arg);
>
> int smu_v13_0_set_vcn_enable(struct smu_context *smu,
> - bool enable);
> + bool enable,
> + int inst);
>
> int smu_v13_0_set_jpeg_enable(struct smu_context *smu,
> bool enable);
> diff --git a/drivers/gpu/drm/amd/pm/swsmu/inc/smu_v14_0.h b/drivers/gpu/drm/amd/pm/swsmu/inc/smu_v14_0.h
> index 07c220102c1d..0546b02e198d 100644
> --- a/drivers/gpu/drm/amd/pm/swsmu/inc/smu_v14_0.h
> +++ b/drivers/gpu/drm/amd/pm/swsmu/inc/smu_v14_0.h
> @@ -210,7 +210,8 @@ int smu_v14_0_wait_for_event(struct smu_context *smu, enum smu_event_type event,
> uint64_t event_arg);
>
> int smu_v14_0_set_vcn_enable(struct smu_context *smu,
> - bool enable);
> + bool enable,
> + int inst);
>
> int smu_v14_0_set_jpeg_enable(struct smu_context *smu,
> bool enable);
> diff --git a/drivers/gpu/drm/amd/pm/swsmu/smu11/arcturus_ppt.c b/drivers/gpu/drm/amd/pm/swsmu/smu11/arcturus_ppt.c
> index 5ad09323a29d..6c8e80f6b592 100644
> --- a/drivers/gpu/drm/amd/pm/swsmu/smu11/arcturus_ppt.c
> +++ b/drivers/gpu/drm/amd/pm/swsmu/smu11/arcturus_ppt.c
> @@ -1571,7 +1571,9 @@ static bool arcturus_is_dpm_running(struct smu_context *smu)
> return !!(feature_enabled & SMC_DPM_FEATURE);
> }
>
> -static int arcturus_dpm_set_vcn_enable(struct smu_context *smu, bool enable)
> +static int arcturus_dpm_set_vcn_enable(struct smu_context *smu,
> + bool enable,
> + int inst)
> {
> int ret = 0;
>
> diff --git a/drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c b/drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c
> index 9fa305ba6422..faa8e7d9c3c6 100644
> --- a/drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c
> +++ b/drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c
> @@ -1135,7 +1135,9 @@ static int navi10_set_default_dpm_table(struct smu_context *smu)
> return 0;
> }
>
> -static int navi10_dpm_set_vcn_enable(struct smu_context *smu, bool enable)
> +static int navi10_dpm_set_vcn_enable(struct smu_context *smu,
> + bool enable,
> + int inst)
> {
> int ret = 0;
>
> diff --git a/drivers/gpu/drm/amd/pm/swsmu/smu11/sienna_cichlid_ppt.c b/drivers/gpu/drm/amd/pm/swsmu/smu11/sienna_cichlid_ppt.c
> index 77e58eb46328..a9cb28ce2133 100644
> --- a/drivers/gpu/drm/amd/pm/swsmu/smu11/sienna_cichlid_ppt.c
> +++ b/drivers/gpu/drm/amd/pm/swsmu/smu11/sienna_cichlid_ppt.c
> @@ -1152,7 +1152,9 @@ static int sienna_cichlid_set_default_dpm_table(struct smu_context *smu)
> return 0;
> }
>
> -static int sienna_cichlid_dpm_set_vcn_enable(struct smu_context *smu, bool enable)
> +static int sienna_cichlid_dpm_set_vcn_enable(struct smu_context *smu,
> + bool enable,
> + int inst)
> {
> struct amdgpu_device *adev = smu->adev;
> int i, ret = 0;
> diff --git a/drivers/gpu/drm/amd/pm/swsmu/smu11/vangogh_ppt.c b/drivers/gpu/drm/amd/pm/swsmu/smu11/vangogh_ppt.c
> index a333ab827f48..a1ef63878cc3 100644
> --- a/drivers/gpu/drm/amd/pm/swsmu/smu11/vangogh_ppt.c
> +++ b/drivers/gpu/drm/amd/pm/swsmu/smu11/vangogh_ppt.c
> @@ -459,7 +459,9 @@ static int vangogh_init_smc_tables(struct smu_context *smu)
> return smu_v11_0_init_smc_tables(smu);
> }
>
> -static int vangogh_dpm_set_vcn_enable(struct smu_context *smu, bool enable)
> +static int vangogh_dpm_set_vcn_enable(struct smu_context *smu,
> + bool enable,
> + int inst)
> {
> int ret = 0;
>
> diff --git a/drivers/gpu/drm/amd/pm/swsmu/smu12/renoir_ppt.c b/drivers/gpu/drm/amd/pm/swsmu/smu12/renoir_ppt.c
> index 0b210b1f2628..a34797f3576b 100644
> --- a/drivers/gpu/drm/amd/pm/swsmu/smu12/renoir_ppt.c
> +++ b/drivers/gpu/drm/amd/pm/swsmu/smu12/renoir_ppt.c
> @@ -645,7 +645,9 @@ static enum amd_pm_state_type renoir_get_current_power_state(struct smu_context
> return pm_type;
> }
>
> -static int renoir_dpm_set_vcn_enable(struct smu_context *smu, bool enable)
> +static int renoir_dpm_set_vcn_enable(struct smu_context *smu,
> + bool enable,
> + int inst)
> {
> int ret = 0;
>
> diff --git a/drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0.c b/drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0.c
> index 6cfd66363915..2bfea740dace 100644
> --- a/drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0.c
> +++ b/drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0.c
> @@ -2104,7 +2104,8 @@ int smu_v13_0_get_current_pcie_link_speed(struct smu_context *smu)
> }
>
> int smu_v13_0_set_vcn_enable(struct smu_context *smu,
> - bool enable)
> + bool enable,
> + int inst)
> {
> struct amdgpu_device *adev = smu->adev;
> int i, ret = 0;
> diff --git a/drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_5_ppt.c b/drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_5_ppt.c
> index a71b7c0803f1..f5db181ef489 100644
> --- a/drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_5_ppt.c
> +++ b/drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_5_ppt.c
> @@ -193,7 +193,9 @@ static int smu_v13_0_5_system_features_control(struct smu_context *smu, bool en)
> return ret;
> }
>
> -static int smu_v13_0_5_dpm_set_vcn_enable(struct smu_context *smu, bool enable)
> +static int smu_v13_0_5_dpm_set_vcn_enable(struct smu_context *smu,
> + bool enable,
> + int inst)
> {
> int ret = 0;
>
> diff --git a/drivers/gpu/drm/amd/pm/swsmu/smu13/yellow_carp_ppt.c b/drivers/gpu/drm/amd/pm/swsmu/smu13/yellow_carp_ppt.c
> index 71d58c8c8cc0..73b4506ef5a8 100644
> --- a/drivers/gpu/drm/amd/pm/swsmu/smu13/yellow_carp_ppt.c
> +++ b/drivers/gpu/drm/amd/pm/swsmu/smu13/yellow_carp_ppt.c
> @@ -220,7 +220,9 @@ static int yellow_carp_system_features_control(struct smu_context *smu, bool en)
> return ret;
> }
>
> -static int yellow_carp_dpm_set_vcn_enable(struct smu_context *smu, bool enable)
> +static int yellow_carp_dpm_set_vcn_enable(struct smu_context *smu,
> + bool enable,
> + int inst)
> {
> int ret = 0;
>
> diff --git a/drivers/gpu/drm/amd/pm/swsmu/smu14/smu_v14_0.c b/drivers/gpu/drm/amd/pm/swsmu/smu14/smu_v14_0.c
> index f7745eaf118e..ecb0164d533e 100644
> --- a/drivers/gpu/drm/amd/pm/swsmu/smu14/smu_v14_0.c
> +++ b/drivers/gpu/drm/amd/pm/swsmu/smu14/smu_v14_0.c
> @@ -1507,7 +1507,8 @@ int smu_v14_0_set_single_dpm_table(struct smu_context *smu,
> }
>
> int smu_v14_0_set_vcn_enable(struct smu_context *smu,
> - bool enable)
> + bool enable,
> + int inst)
> {
> struct amdgpu_device *adev = smu->adev;
> int i, ret = 0;
> --
> 2.34.1
>
