[PATCH 1/3] amdgpu/pm: add limit_type to (pptable_funcs)->set_power_limit signature
Lazar, Lijo
lijo.lazar at amd.com
Mon Oct 4 10:27:39 UTC 2021
On 10/3/2021 10:16 AM, Darren Powell wrote:
> modify (pptable_funcs)->set_power_limit signature
> modify smu11 set_power_limit signature (arcturus, navi10, sienna_cichlid)
> modify smu13 set_power_limit signature (aldabaran)
> modify vangogh_set_power_limit signature (vangogh)
>
> === Test ===
> sudo bash
>
> AMDGPU_PCI_ADDR=`lspci -nn | grep "VGA\|Display" | cut -d " " -f 1`
> AMDGPU_HWMON=`ls -la /sys/class/hwmon | grep $AMDGPU_PCI_ADDR | awk '{print $9}'`
> HWMON_DIR=/sys/class/hwmon/${AMDGPU_HWMON}
> LOGFILE=pp_show_power_cap.log
>
> cp $LOGFILE{,.old}
> lspci -nn | grep "VGA\|Display" > $LOGFILE
> FILES="
> power1_cap
> power2_cap"
>
> for f in $FILES
> do
> if test -f "$HWMON_DIR/$f"; then
> echo === $f === >> $LOGFILE
> cat $HWMON_DIR/$f >> $LOGFILE
> RESTORE_VALUE=`cat $HWMON_DIR/$f` 2>&1 >> $LOGFILE
> echo RESTORE_VALUE $RESTORE_VALUE >> $LOGFILE
> echo 120000000 > $HWMON_DIR/$f
> sleep 3
> cat $HWMON_DIR/$f >> $LOGFILE
> echo $RESTORE_VALUE > $HWMON_DIR/$f
> sleep 3
> cat $HWMON_DIR/$f >> $LOGFILE
> else
> echo === $f === >> $LOGFILE
> echo File Not Found >> $LOGFILE
> fi
> done
> cat $LOGFILE
>
> Signed-off-by: Darren Powell <darren.powell at amd.com>
> ---
> drivers/gpu/drm/amd/pm/inc/amdgpu_smu.h | 4 +++-
> drivers/gpu/drm/amd/pm/inc/smu_v11_0.h | 4 +++-
> drivers/gpu/drm/amd/pm/inc/smu_v13_0.h | 4 +++-
> drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c | 5 +++--
> drivers/gpu/drm/amd/pm/swsmu/smu11/smu_v11_0.c | 14 ++++++++------
> drivers/gpu/drm/amd/pm/swsmu/smu11/vangogh_ppt.c | 7 ++++---
> drivers/gpu/drm/amd/pm/swsmu/smu13/aldebaran_ppt.c | 6 ++++--
> drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0.c | 8 +++++---
> 8 files changed, 33 insertions(+), 19 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/pm/inc/amdgpu_smu.h b/drivers/gpu/drm/amd/pm/inc/amdgpu_smu.h
> index 8156729c370b..3557f4e7fc30 100644
> --- a/drivers/gpu/drm/amd/pm/inc/amdgpu_smu.h
> +++ b/drivers/gpu/drm/amd/pm/inc/amdgpu_smu.h
> @@ -1008,7 +1008,9 @@ struct pptable_funcs {
> /**
> * @set_power_limit: Set power limit in watts.
> */
> - int (*set_power_limit)(struct smu_context *smu, uint32_t n);
> + int (*set_power_limit)(struct smu_context *smu,
> + enum smu_ppt_limit_type limit_type,
> + uint32_t limit);
>
> /**
> * @init_max_sustainable_clocks: Populate max sustainable clock speed
> diff --git a/drivers/gpu/drm/amd/pm/inc/smu_v11_0.h b/drivers/gpu/drm/amd/pm/inc/smu_v11_0.h
> index cbdae8a2c698..2d422e6a9feb 100644
> --- a/drivers/gpu/drm/amd/pm/inc/smu_v11_0.h
> +++ b/drivers/gpu/drm/amd/pm/inc/smu_v11_0.h
> @@ -197,7 +197,9 @@ int smu_v11_0_notify_display_change(struct smu_context *smu);
> int smu_v11_0_get_current_power_limit(struct smu_context *smu,
> uint32_t *power_limit);
>
> -int smu_v11_0_set_power_limit(struct smu_context *smu, uint32_t n);
> +int smu_v11_0_set_power_limit(struct smu_context *smu,
> + enum smu_ppt_limit_type limit_type,
> + uint32_t limit);
>
> int smu_v11_0_init_max_sustainable_clocks(struct smu_context *smu);
>
> diff --git a/drivers/gpu/drm/amd/pm/inc/smu_v13_0.h b/drivers/gpu/drm/amd/pm/inc/smu_v13_0.h
> index dc91eb608791..e5d3b0d1a032 100644
> --- a/drivers/gpu/drm/amd/pm/inc/smu_v13_0.h
> +++ b/drivers/gpu/drm/amd/pm/inc/smu_v13_0.h
> @@ -163,7 +163,9 @@ int smu_v13_0_notify_display_change(struct smu_context *smu);
> int smu_v13_0_get_current_power_limit(struct smu_context *smu,
> uint32_t *power_limit);
>
> -int smu_v13_0_set_power_limit(struct smu_context *smu, uint32_t n);
> +int smu_v13_0_set_power_limit(struct smu_context *smu,
> + enum smu_ppt_limit_type limit_type,
> + uint32_t limit);
>
> int smu_v13_0_init_max_sustainable_clocks(struct smu_context *smu);
>
> diff --git a/drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c b/drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c
> index a2a2a8398cd7..faa78a048b1f 100644
> --- a/drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c
> +++ b/drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c
> @@ -2342,9 +2342,10 @@ static int smu_set_power_limit(void *handle, uint32_t limit)
>
> mutex_lock(&smu->mutex);
>
> + limit &= (1<<24)-1;
> if (limit_type != SMU_DEFAULT_PPT_LIMIT)
> if (smu->ppt_funcs->set_power_limit) {
> - ret = smu->ppt_funcs->set_power_limit(smu, limit);
> + ret = smu->ppt_funcs->set_power_limit(smu, limit_type, limit);
> goto out;
> }
>
> @@ -2360,7 +2361,7 @@ static int smu_set_power_limit(void *handle, uint32_t limit)
> limit = smu->current_power_limit;
>
> if (smu->ppt_funcs->set_power_limit) {
> - ret = smu->ppt_funcs->set_power_limit(smu, limit);
> + ret = smu->ppt_funcs->set_power_limit(smu, limit_type, limit);
> if (!ret && !(smu->user_dpm_profile.flags & SMU_DPM_USER_PROFILE_RESTORE))
> smu->user_dpm_profile.power_limit = limit;
> }
> diff --git a/drivers/gpu/drm/amd/pm/swsmu/smu11/smu_v11_0.c b/drivers/gpu/drm/amd/pm/swsmu/smu11/smu_v11_0.c
> index 3470c33ee09d..aedaa4bb15c2 100644
> --- a/drivers/gpu/drm/amd/pm/swsmu/smu11/smu_v11_0.c
> +++ b/drivers/gpu/drm/amd/pm/swsmu/smu11/smu_v11_0.c
> @@ -978,7 +978,9 @@ int smu_v11_0_get_current_power_limit(struct smu_context *smu,
> return ret;
> }
>
> -int smu_v11_0_set_power_limit(struct smu_context *smu, uint32_t n)
> +int smu_v11_0_set_power_limit(struct smu_context *smu,
> + enum smu_ppt_limit_type limit_type,
> + uint32_t limit)
> {
> int power_src;
> int ret = 0;
> @@ -1001,16 +1003,16 @@ int smu_v11_0_set_power_limit(struct smu_context *smu, uint32_t n)
> * BIT 16-23: PowerSource
> * BIT 0-15: PowerLimit
> */
> - n &= 0xFFFF;
> - n |= 0 << 24;
> - n |= (power_src) << 16;
> - ret = smu_cmn_send_smc_msg_with_param(smu, SMU_MSG_SetPptLimit, n, NULL);
Since limit_type is introduced as arg, could you also add below to
smuv11/v13? Currently, anything other than default is used only in vangogh.
if (limit_type != SMU_DEFAULT_PPT_LIMIT)
return -EINVAL;
That will also avoid any 'unused variable' warning.
Thanks,
Lijo
> + limit &= 0xFFFF;
> + limit |= 0 << 24;
> + limit |= (power_src) << 16;
> + ret = smu_cmn_send_smc_msg_with_param(smu, SMU_MSG_SetPptLimit, limit, NULL);
> if (ret) {
> dev_err(smu->adev->dev, "[%s] Set power limit Failed!\n", __func__);
> return ret;
> }
>
> - smu->current_power_limit = n;
> + smu->current_power_limit = limit;
>
> return 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 f6ef0ce6e9e2..eba516428f1b 100644
> --- a/drivers/gpu/drm/amd/pm/swsmu/smu11/vangogh_ppt.c
> +++ b/drivers/gpu/drm/amd/pm/swsmu/smu11/vangogh_ppt.c
> @@ -2144,11 +2144,12 @@ static int vangogh_get_ppt_limit(struct smu_context *smu,
> return 0;
> }
>
> -static int vangogh_set_power_limit(struct smu_context *smu, uint32_t ppt_limit)
> +static int vangogh_set_power_limit(struct smu_context *smu,
> + enum smu_ppt_limit_type limit_type,
> + uint32_t ppt_limit)
> {
> struct smu_11_5_power_context *power_context =
> - smu->smu_power.power_context;
> - uint32_t limit_type = ppt_limit >> 24;
> + smu->smu_power.power_context;
> int ret = 0;
>
> if (!smu_cmn_feature_is_enabled(smu, SMU_FEATURE_PPT_BIT)) {
> diff --git a/drivers/gpu/drm/amd/pm/swsmu/smu13/aldebaran_ppt.c b/drivers/gpu/drm/amd/pm/swsmu/smu13/aldebaran_ppt.c
> index 5019903db492..59a7d276541d 100644
> --- a/drivers/gpu/drm/amd/pm/swsmu/smu13/aldebaran_ppt.c
> +++ b/drivers/gpu/drm/amd/pm/swsmu/smu13/aldebaran_ppt.c
> @@ -1241,11 +1241,13 @@ static int aldebaran_get_power_limit(struct smu_context *smu,
> return 0;
> }
>
> -static int aldebaran_set_power_limit(struct smu_context *smu, uint32_t n)
> +static int aldebaran_set_power_limit(struct smu_context *smu,
> + enum smu_ppt_limit_type limit_type,
> + uint32_t limit)
> {
> /* Power limit can be set only through primary die */
> if (aldebaran_is_primary(smu))
> - return smu_v13_0_set_power_limit(smu, n);
> + return smu_v13_0_set_power_limit(smu, limit_type, limit);
>
> return -EINVAL;
> }
> 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 05c5e61f3506..58d837d9a414 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
> @@ -945,7 +945,9 @@ int smu_v13_0_get_current_power_limit(struct smu_context *smu,
> return ret;
> }
>
> -int smu_v13_0_set_power_limit(struct smu_context *smu, uint32_t n)
> +int smu_v13_0_set_power_limit(struct smu_context *smu,
> + enum smu_ppt_limit_type limit_type,
> + uint32_t limit)
> {
> int ret = 0;
>
> @@ -954,13 +956,13 @@ int smu_v13_0_set_power_limit(struct smu_context *smu, uint32_t n)
> return -EOPNOTSUPP;
> }
>
> - ret = smu_cmn_send_smc_msg_with_param(smu, SMU_MSG_SetPptLimit, n, NULL);
> + ret = smu_cmn_send_smc_msg_with_param(smu, SMU_MSG_SetPptLimit, limit, NULL);
> if (ret) {
> dev_err(smu->adev->dev, "[%s] Set power limit Failed!\n", __func__);
> return ret;
> }
>
> - smu->current_power_limit = n;
> + smu->current_power_limit = limit;
>
> return 0;
> }
>
More information about the amd-gfx
mailing list