amdgpu/pm: Powerplay API for smu
Subsystems (3)
cover amdgpu/pm: Powerplay API for smu
=== Description ===
Patches to add the Powerplay API to smu and simplify dpm/pm calling code
=== Test System ===
* DESKTOP(AMD FX-8350 + NAVI10(731F/ca), BIOS: F2)
+ ISO(Ubuntu 20.04.1 LTS)
+ Kernel(5.9.0-rc5-custom-pmcallback-00865-gd3b9ec1a13c9)
=== Patch Summary ===
linux: (git://people.freedesktop.org/~agd5f/linux) origin/amd-staging-drm-next @ d3b9ec1a13c9
+ 05e1d87d1cb4 amdgpu/pm: Powerplay API for smu , added get_performance_level
+ b9e2be067f01 amdgpu/pm: Powerplay API for smu , changed 6 dpm reset functions to use API
+ 9add1d6485a4 amdgpu/pm: Powerplay API for smu , changed 6 pm hwmon fan functions to use API
+ c02b35074f14 amdgpu/pm: Powerplay API for smu , changed 9 pm power functions to use API
+ 483bd1207f2c amdgpu/pm: Powerplay API for smu , changed 5 dpm powergating & sensor functions to use API
+ f91c1665e30e amdgpu/pm: Powerplay API for smu , changes to clock and profile mode functions
+ d1400afa4785 amdgpu/pm: Powerplay API for smu , changed 4 dpm functions to use API
+ 2f12f7afa690 amdgpu/pm: Powerplay API for smu , updates to some pm functions
=== Tests ===
** 0001
amdgpu_get_power_dpm_force_performance_level() <- /sys/class/drm/card0/device/power_dpm_force_performance_level
** 0002
amdgpu_dpm_set_mp1_state <- systemctl suspend amdgpu_dpm_mode2_reset <- untested: needs Arctic Islands Hardware (VEGAx, RAVEN) amdgpu_dpm_switch_power_profile <- untested amdgpu_dpm_set_xgmi_pstate <- untested: amdgpu_xgmi_set_pstate():411 pstate switching disabled amdgpu_dpm_set_df_cstate <- untested: needs ras enabled hardware amdgpu_dpm_enable_mgpu_fan_boost <- untested: needs multi-gpu hardware ** 0003 amdgpu_hwmon_get_pwm1_enable <- /sys/class/drm/card0/device/hwmon/hwmon?/pwm1_enable amdgpu_hwmon_set_pwm1_enable <- /sys/class/drm/card0/device/hwmon/hwmon?/pwm1_enable amdgpu_hwmon_set_pwm1 <- /sys/class/drm/card0/device/hwmon/hwmon?/pwm1 amdgpu_hwmon_get_pwm1 <- /sys/class/drm/card0/device/hwmon/hwmon?/pwm1 amdgpu_hwmon_get_fan1_input <- /sys/class/drm/card0/device/hwmon/hwmon?/fan1_input amdgpu_hwmon_get_fan1_target <- /sys/class/drm/card0/device/hwmon/hwmon?/fan1_target amdgpu_hwmon_set_fan1_target <- /sys/class/drm/card0/device/hwmon/hwmon?/fan1_target amdgpu_hwmon_get_fan1_enable <- /sys/class/drm/card0/device/hwmon/hwmon?/fan1_enable amdgpu_hwmon_set_fan1_enable <- /sys/class/drm/card0/device/hwmon/hwmon?/fan1_enable ** 0004 amdgpu_get_power_dpm_state <- /sys/class/drm/card0/device/power_dpm_state amdgpu_set_power_dpm_force_performance_level <- /sys/class/drm/card0/device/power_dpm_force_performance_level amdgpu_get_pp_num_states <- /sys/class/drm/card0/device/pp_num_states amdgpu_get_pp_cur_state <- /sys/class/drm/card0/device/pp_cur_state amdgpu_get_pp_table <- /sys/class/drm/card0/device/pp_table amdgpu_get_pp_features <- /sys/class/drm/card0/device/pp_features amdgpu_hwmon_show_power_cap_max <- /sys/class/drm/card0/device/hwmon/hwmon?/power1_cap_max amdgpu_hwmon_show_power_cap <- /sys/class/drm/card0/device/hwmon/hwmon?/power1_cap amdgpu_hwmon_set_power_cap <- /sys/class/drm/card0/device/hwmon/hwmon?/power1_cap ** 0005 amdgpu_dpm_baco_enter <- untested: called from runtime.pm amdgpu_dpm_baco_exit <- untested: called from runtime.pm amdgpu_dpm_is_baco_supported <- untested: needs other Hardware(cik, vi, soc15) amdgpu_dpm_baco_reset <- untested: needs other Hardware(cik, vi, soc15) ** 0006 amdgpu_get_pp_dpm_sclk <- /sys/class/drm/card0/device/pp_dpm_sclk amdgpu_set_pp_dpm_sclk <- /sys/class/drm/card0/device/pp_dpm_sclk amdgpu_get_pp_dpm_mclk <- /sys/class/drm/card0/device/pp_dpm_mclk amdgpu_set_pp_dpm_mclk <- /sys/class/drm/card0/device/pp_dpm_mclk amdgpu_get_pp_dpm_socclk <- /sys/class/drm/card0/device/pp_dpm_socclk amdgpu_set_pp_dpm_socclk <- /sys/class/drm/card0/device/pp_dpm_socclk amdgpu_get_pp_dpm_fclk <- /sys/class/drm/card0/device/pp_dpm_fclk amdgpu_set_pp_dpm_fclk <- /sys/class/drm/card0/device/pp_dpm_fclk amdgpu_get_pp_dpm_dcefclk <- /sys/class/drm/card0/device/pp_dpm_dcefclk amdgpu_set_pp_dpm_dcefclk <- /sys/class/drm/card0/device/pp_dpm_dcefclk amdgpu_get_pp_dpm_pcie <- /sys/class/drm/card0/device/pp_dpm_pcie amdgpu_set_pp_dpm_pcie <- /sys/class/drm/card0/device/pp_dpm_pcie amdgpu_get_pp_power_profile_mode <- /sys/class/drm/card0/device/pp_power_profile_mode amdgpu_set_pp_power_profile_mode <- /sys/class/drm/card0/device/pp_power_profile_mode amdgpu_get_gpu_metrics <- /sys/class/drm/card0/device/gpu_metrics ** 0007 amdgpu_pm_compute_clocks <- untested amdgpu_dpm_set_powergating_by_smu <- untested amdgpu_dpm_get_mclk <- untested amdgpu_dpm_get_sclk <- untested ** 0008 amdgpu_get_pp_od_clk_voltage <- /sys/class/drm/card0/device/pp_od_clk_voltage amdgpu_set_pp_od_clk_voltage <- /sys/class/drm/card0/device/pp_od_clk_voltage amdgpu_set_pp_table <- /sys/class/drm/card0/device/pp_table
amdgpu_set_power_dpm_force_performance_level <- /sys/class/drm/card0/device/power_dpm_force_performance_level
=== Summary of Untested Functions ===
** 0002
amdgpu_dpm_mode2_reset <- untested: needs Arctic Islands Hardware (VEGAx, RAVEN) amdgpu_dpm_switch_power_profile <- untested: called during initialization amdgpu_dpm_set_xgmi_pstate <- untested: amdgpu_xgmi_set_pstate():411 pstate switching disabled amdgpu_dpm_set_df_cstate <- untested: needs ras enabled hardware amdgpu_dpm_enable_mgpu_fan_boost <- untested: needs multi-gpu hardware ** 0005 amdgpu_dpm_baco_enter <- untested: called from runtime.pm amdgpu_dpm_baco_exit <- untested: called from runtime.pm amdgpu_dpm_is_baco_supported <- untested: needs other Hardware(cik, vi, soc15) amdgpu_dpm_baco_reset <- untested: needs other Hardware(cik, vi, soc15) ** 0007 amdgpu_pm_compute_clocks <- untested amdgpu_dpm_set_powergating_by_smu <- untested amdgpu_dpm_get_mclk <- untested amdgpu_dpm_get_sclk <- untested ** 0008 amdgpu_get_pp_od_clk_voltage <- file not found amdgpu_set_pp_od_clk_voltage <- file not found amdgpu_set_pp_table <- no binary data to test with
=== Cover Letter ===
Darren Powell (8):
amdgpu/pm: Powerplay API for smu , added get_performance_level amdgpu/pm: Powerplay API for smu , changed 6 dpm reset functions to
use API
amdgpu/pm: Powerplay API for smu , changed 6 pm hwmon fan functions to
use API
amdgpu/pm: Powerplay API for smu , changed 9 pm power functions to use
API
amdgpu/pm: Powerplay API for smu , changed 5 dpm powergating & sensor
functions to use API
amdgpu/pm: Powerplay API for smu , changes to clock and profile mode
functions
amdgpu/pm: Powerplay API for smu , changed 4 dpm functions to use API amdgpu/pm: Powerplay API for smu , updates to some pm functions
drivers/gpu/drm/amd/pm/amdgpu_dpm.c | 226 +++----- drivers/gpu/drm/amd/pm/amdgpu_pm.c | 596 +++++----------------- drivers/gpu/drm/amd/pm/inc/amdgpu_smu.h | 79 ++- drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c | 334 +++++++++--- 4 files changed, 511 insertions(+), 724 deletions(-)
Signature · 6 lines
2.25.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 1/8 amdgpu/pm: Powerplay API for smu , added get_performance_level
Modified Functions
smu_get_performance_level() - modifed arg0 to match Powerplay API get_performance_level
Other Changes
added a new structure swsmu_dpm_funcs to hold smu functions for Powerplay API removed special smu handling from amdgpu_get_power_dpm_force_performance_level
--- drivers/gpu/drm/amd/pm/amdgpu_pm.c | 4 +--- drivers/gpu/drm/amd/pm/inc/amdgpu_smu.h | 2 +- drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c | 12 +++++++++++- 3 files changed, 13 insertions(+), 5 deletions(-)
drivers/gpu/drm/amd/pm/amdgpu_pm.c +1 -3
@@ -280,9 +280,7 @@ static ssize_t amdgpu_get_power_dpm_force_performance_level(struct device *dev,return ret; } -if (is_support_sw_smu (adev)) - level =smu_get_performance_level (&adev->smu); -else if (adev->powerplay.pp_funcs->get_performance_level) +if (adev->powerplay.pp_funcs->get_performance_level) level =amdgpu_dpm_get_performance_level (adev);else level = adev->pm.dpm.forced_level;
drivers/gpu/drm/amd/pm/inc/amdgpu_smu.h +1 -1
@@ -743,7 +743,7 @@ int smu_get_dpm_freq_range(struct smu_context *smu, enum smu_clk_type clk_type, uint32_t *min, uint32_t *max);int smu_set_soft_freq_range (struct smu_context *smu,enum smu_clk_type clk_type,uint32_t min,uint32_t max); -enum amd_dpm_forced_level smu_get_performance_level (struct smu_context *smu); +enum amd_dpm_forced_level smu_get_performance_level (void *handle);int smu_force_performance_level (struct smu_context *smu,enum amd_dpm_forced_level level);int smu_set_display_count (struct smu_context *smu,uint32_t count);int smu_set_ac_dc (struct smu_context *smu);
drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c +11 -1
@@ -46,6 +46,8 @@#undef pr_info#undef pr_debug +static const struct amd_pm_funcs swsmu_dpm_funcs; +size_t smu_sys_get_pp_feature_mask (struct smu_context *smu,char *buf) {size_t size =0 ;
@@ -428,6 +430,9 @@ static int smu_early_init(void *handle) smu->smu_baco.state =SMU_BACO_STATE_EXIT ; smu->smu_baco.platform_support = false; + adev->powerplay.pp_handle = smu; + adev->powerplay.pp_funcs = &swsmu_dpm_funcs; +return smu_set_funcs (adev); }
@@ -1569,8 +1574,9 @@ int smu_switch_power_profile(struct smu_context *smu,return 0 ; } -enum amd_dpm_forced_level smu_get_performance_level (struct smu_context *smu) +enum amd_dpm_forced_level smu_get_performance_level (void *handle) { +struct smu_context *smu = handle;struct smu_dpm_context *smu_dpm_ctx = &(smu->smu_dpm);enum amd_dpm_forced_level level;
@@ -2549,3 +2555,7 @@ int smu_gfx_state_change_set(struct smu_context *smu, uint32_t state)return ret; } + +static const struct amd_pm_funcs swsmu_dpm_funcs = { + .get_performance_level = smu_get_performance_level, +};
Signature · 6 lines
2.25.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 3/8 amdgpu/pm: Powerplay API for smu , changed 6 pm hwmon fan functions to use API
In reply to Darren PowellModified Functions
smu_set_fan_speed_rpm() - modifed arg0 to match Powerplay API set_fan_speed_rpm smu_get_fan_control_mode() - modifed signature to match Powerplay API get_fan_control_mode smu_set_fan_control_mode() - modifed signature to match Powerplay API set_fan_control_mode
smu_get_fan_speed_percent() - modifed signature to match Powerplay API get_fan_speed_percent smu_set_fan_speed_percent() - modifed signature to match Powerplay API set_fan_speed_percent
smu_get_fan_speed_rpm() - modifed arg0 to match Powerplay API get_fan_speed_rpm
Other Changes
added 6 above smu fan Powerplay functions to swsmu_dpm_funcs removed special smu handling of above functions and called through Powerplay API
--- drivers/gpu/drm/amd/pm/amdgpu_pm.c | 87 +++++++---------------- drivers/gpu/drm/amd/pm/inc/amdgpu_smu.h | 12 ++-- drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c | 33 ++++++--- 3 files changed, 55 insertions(+), 77 deletions(-)
drivers/gpu/drm/amd/pm/amdgpu_pm.c +27 -60
@@ -2349,18 +2349,14 @@ static ssize_t amdgpu_hwmon_get_pwm1_enable(struct device *dev,return ret; } -if (is_support_sw_smu (adev)) { - pwm_mode =smu_get_fan_control_mode (&adev->smu); - }else { -if (!adev->powerplay.pp_funcs->get_fan_control_mode) { +if (!adev->powerplay.pp_funcs->get_fan_control_mode) {pm_runtime_mark_last_busy (adev_to_drm (adev)->dev);pm_runtime_put_autosuspend (adev_to_drm (adev)->dev);return -EINVAL ; - } - - pwm_mode =amdgpu_dpm_get_fan_control_mode (adev); } + pwm_mode =amdgpu_dpm_get_fan_control_mode (adev); +pm_runtime_mark_last_busy (adev_to_drm (adev)->dev);pm_runtime_put_autosuspend (adev_to_drm (adev)->dev);
@@ -2389,18 +2385,14 @@ static ssize_t amdgpu_hwmon_set_pwm1_enable(struct device *dev,return ret; } -if (is_support_sw_smu (adev)) { -smu_set_fan_control_mode (&adev->smu, value); - }else { -if (!adev->powerplay.pp_funcs->set_fan_control_mode) { -pm_runtime_mark_last_busy (adev_to_drm (adev)->dev); -pm_runtime_put_autosuspend (adev_to_drm (adev)->dev); -return -EINVAL ; - } - -amdgpu_dpm_set_fan_control_mode (adev, value); +if (!adev->powerplay.pp_funcs->set_fan_control_mode) { +pm_runtime_mark_last_busy (adev_to_drm (adev)->dev); +pm_runtime_put_autosuspend (adev_to_drm (adev)->dev); +return -EINVAL ; } +amdgpu_dpm_set_fan_control_mode (adev, value); +pm_runtime_mark_last_busy (adev_to_drm (adev)->dev);pm_runtime_put_autosuspend (adev_to_drm (adev)->dev);
@@ -2439,11 +2431,7 @@ static ssize_t amdgpu_hwmon_set_pwm1(struct device *dev,return err; } -if (is_support_sw_smu (adev)) - pwm_mode =smu_get_fan_control_mode (&adev->smu); -else - pwm_mode =amdgpu_dpm_get_fan_control_mode (adev); - + pwm_mode =amdgpu_dpm_get_fan_control_mode (adev);if (pwm_mode !=AMD_FAN_CTRL_MANUAL ) {pr_info ("manual fan speed control should be enabled first\n" );pm_runtime_mark_last_busy (adev_to_drm (adev)->dev);
@@ -2460,9 +2448,7 @@ static ssize_t amdgpu_hwmon_set_pwm1(struct device *dev, value = (value *100 ) /255 ; -if (is_support_sw_smu (adev)) - err =smu_set_fan_speed_percent (&adev->smu, value); -else if (adev->powerplay.pp_funcs->set_fan_speed_percent) +if (adev->powerplay.pp_funcs->set_fan_speed_percent) err =amdgpu_dpm_set_fan_speed_percent (adev, value);else err = -EINVAL ;
@@ -2493,9 +2479,7 @@ static ssize_t amdgpu_hwmon_get_pwm1(struct device *dev,return err; } -if (is_support_sw_smu (adev)) - err =smu_get_fan_speed_percent (&adev->smu, &speed); -else if (adev->powerplay.pp_funcs->get_fan_speed_percent) +if (adev->powerplay.pp_funcs->get_fan_speed_percent) err =amdgpu_dpm_get_fan_speed_percent (adev, &speed);else err = -EINVAL ;
@@ -2528,9 +2512,7 @@ static ssize_t amdgpu_hwmon_get_fan1_input(struct device *dev,return err; } -if (is_support_sw_smu (adev)) - err =smu_get_fan_speed_rpm (&adev->smu, &speed); -else if (adev->powerplay.pp_funcs->get_fan_speed_rpm) +if (adev->powerplay.pp_funcs->get_fan_speed_rpm) err =amdgpu_dpm_get_fan_speed_rpm (adev, &speed);else err = -EINVAL ;
@@ -2621,9 +2603,7 @@ static ssize_t amdgpu_hwmon_get_fan1_target(struct device *dev,return err; } -if (is_support_sw_smu (adev)) - err =smu_get_fan_speed_rpm (&adev->smu, &rpm); -else if (adev->powerplay.pp_funcs->get_fan_speed_rpm) +if (adev->powerplay.pp_funcs->get_fan_speed_rpm) err =amdgpu_dpm_get_fan_speed_rpm (adev, &rpm);else err = -EINVAL ;
@@ -2655,10 +2635,7 @@ static ssize_t amdgpu_hwmon_set_fan1_target(struct device *dev,return err; } -if (is_support_sw_smu (adev)) - pwm_mode =smu_get_fan_control_mode (&adev->smu); -else - pwm_mode =amdgpu_dpm_get_fan_control_mode (adev); + pwm_mode =amdgpu_dpm_get_fan_control_mode (adev);if (pwm_mode !=AMD_FAN_CTRL_MANUAL ) {pm_runtime_mark_last_busy (adev_to_drm (adev)->dev);
@@ -2673,9 +2650,7 @@ static ssize_t amdgpu_hwmon_set_fan1_target(struct device *dev,return err; } -if (is_support_sw_smu (adev)) - err =smu_set_fan_speed_rpm (&adev->smu, value); -else if (adev->powerplay.pp_funcs->set_fan_speed_rpm) +if (adev->powerplay.pp_funcs->set_fan_speed_rpm) err =amdgpu_dpm_set_fan_speed_rpm (adev, value);else err = -EINVAL ;
@@ -2706,18 +2681,14 @@ static ssize_t amdgpu_hwmon_get_fan1_enable(struct device *dev,return ret; } -if (is_support_sw_smu (adev)) { - pwm_mode =smu_get_fan_control_mode (&adev->smu); - }else { -if (!adev->powerplay.pp_funcs->get_fan_control_mode) { -pm_runtime_mark_last_busy (adev_to_drm (adev)->dev); -pm_runtime_put_autosuspend (adev_to_drm (adev)->dev); -return -EINVAL ; - } - - pwm_mode =amdgpu_dpm_get_fan_control_mode (adev); +if (!adev->powerplay.pp_funcs->get_fan_control_mode) { +pm_runtime_mark_last_busy (adev_to_drm (adev)->dev); +pm_runtime_put_autosuspend (adev_to_drm (adev)->dev); +return -EINVAL ; } + pwm_mode =amdgpu_dpm_get_fan_control_mode (adev); +pm_runtime_mark_last_busy (adev_to_drm (adev)->dev);pm_runtime_put_autosuspend (adev_to_drm (adev)->dev);
@@ -2754,16 +2725,12 @@ static ssize_t amdgpu_hwmon_set_fan1_enable(struct device *dev,return err; } -if (is_support_sw_smu (adev)) { -smu_set_fan_control_mode (&adev->smu, pwm_mode); - }else { -if (!adev->powerplay.pp_funcs->set_fan_control_mode) { -pm_runtime_mark_last_busy (adev_to_drm (adev)->dev); -pm_runtime_put_autosuspend (adev_to_drm (adev)->dev); -return -EINVAL ; - } -amdgpu_dpm_set_fan_control_mode (adev, pwm_mode); +if (!adev->powerplay.pp_funcs->set_fan_control_mode) { +pm_runtime_mark_last_busy (adev_to_drm (adev)->dev); +pm_runtime_put_autosuspend (adev_to_drm (adev)->dev); +return -EINVAL ; } +amdgpu_dpm_set_fan_control_mode (adev, pwm_mode);pm_runtime_mark_last_busy (adev_to_drm (adev)->dev);pm_runtime_put_autosuspend (adev_to_drm (adev)->dev);
drivers/gpu/drm/amd/pm/inc/amdgpu_smu.h +6 -6
@@ -657,7 +657,7 @@ int smu_check_fw_status(struct smu_context *smu);int smu_set_gfx_cgpg (struct smu_context *smu,bool enabled); -int smu_set_fan_speed_rpm (struct smu_context *smu,uint32_t speed); +int smu_set_fan_speed_rpm (void *handle,uint32_t speed); int smu_get_power_limit(struct smu_context *smu, uint32_t *limit,
@@ -679,11 +679,11 @@ int smu_set_power_profile_mode(struct smu_context *smu,long *param, uint32_t param_size, bool lock_needed); -int smu_get_fan_control_mode (struct smu_context *smu); -int smu_set_fan_control_mode (struct smu_context *smu,int value); -int smu_get_fan_speed_percent (struct smu_context *smu,uint32_t *speed); -int smu_set_fan_speed_percent (struct smu_context *smu,uint32_t speed); -int smu_get_fan_speed_rpm (struct smu_context *smu,uint32_t *speed); +u32 smu_get_fan_control_mode (void *handle); +void smu_set_fan_control_mode (void *handle,u32 value); +int smu_get_fan_speed_percent (void *handle,u32 *speed); +int smu_set_fan_speed_percent (void *handle,u32 speed); +int smu_get_fan_speed_rpm (void *handle,uint32_t *speed);int smu_set_deep_sleep_dcefclk (struct smu_context *smu,int clk);
drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c +22 -11
@@ -1896,8 +1896,9 @@ int smu_set_gfx_cgpg(struct smu_context *smu, bool enabled)return ret; } -int smu_set_fan_speed_rpm (struct smu_context *smu,uint32_t speed) +int smu_set_fan_speed_rpm (void *handle,uint32_t speed) { +struct smu_context *smu = handle;int ret =0 ;if (!smu->pm_enabled || !smu->adev->pm.dpm_enabled)
@@ -2100,9 +2101,10 @@ int smu_set_power_profile_mode(struct smu_context *smu, } -int smu_get_fan_control_mode (struct smu_context *smu) +u32 smu_get_fan_control_mode (void *handle) { -int ret =0 ; +struct smu_context *smu = handle; +u32 ret =0 ;if (!smu->pm_enabled || !smu->adev->pm.dpm_enabled)return -EOPNOTSUPP ;
@@ -2117,25 +2119,26 @@ int smu_get_fan_control_mode(struct smu_context *smu)return ret; } -int smu_set_fan_control_mode (struct smu_context *smu,int value) +void smu_set_fan_control_mode (void *handle,u32 value) { -int ret =0 ; +struct smu_context *smu = handle;if (!smu->pm_enabled || !smu->adev->pm.dpm_enabled) -return -EOPNOTSUPP ; +return ;mutex_lock (&smu->mutex);if (smu->ppt_funcs->set_fan_control_mode) - ret = smu->ppt_funcs->set_fan_control_mode (smu, value); + smu->ppt_funcs->set_fan_control_mode (smu, value);mutex_unlock (&smu->mutex); -return ret; +return ; } -int smu_get_fan_speed_percent (struct smu_context *smu,uint32_t *speed) +int smu_get_fan_speed_percent (void *handle,u32 *speed) { +struct smu_context *smu = handle;int ret =0 ;uint32_t percent;uint32_t current_rpm;
@@ -2159,8 +2162,9 @@ int smu_get_fan_speed_percent(struct smu_context *smu, uint32_t *speed)return ret; } -int smu_set_fan_speed_percent (struct smu_context *smu,uint32_t speed) +int smu_set_fan_speed_percent (void *handle,u32 speed) { +struct smu_context *smu = handle;int ret =0 ;uint32_t rpm;
@@ -2181,8 +2185,9 @@ int smu_set_fan_speed_percent(struct smu_context *smu, uint32_t speed)return ret; } -int smu_get_fan_speed_rpm (struct smu_context *smu,uint32_t *speed) +int smu_get_fan_speed_rpm (void *handle,uint32_t *speed) { +struct smu_context *smu = handle;int ret =0 ;if (!smu->pm_enabled || !smu->adev->pm.dpm_enabled)
@@ -2564,7 +2569,13 @@ int smu_gfx_state_change_set(struct smu_context *smu, uint32_t state)static const struct amd_pm_funcs swsmu_dpm_funcs = {/* export for sysfs */ + .set_fan_control_mode = smu_set_fan_control_mode, + .get_fan_control_mode = smu_get_fan_control_mode, + .set_fan_speed_percent = smu_set_fan_speed_percent, + .get_fan_speed_percent = smu_get_fan_speed_percent, .get_performance_level = smu_get_performance_level, + .get_fan_speed_rpm = smu_get_fan_speed_rpm, + .set_fan_speed_rpm = smu_set_fan_speed_rpm, .switch_power_profile = smu_switch_power_profile,/* export to amdgpu */ .set_mp1_state = smu_set_mp1_state,
Signature · 6 lines
2.25.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 2/8 amdgpu/pm: Powerplay API for smu , changed 6 dpm reset functions to use API
In reply to Darren PowellModified Functions
smu_set_xgmi_pstate() - modifed arg0 to match Powerplay API set_xgmi_pstate smu_mode2_reset() - modifed arg0 to match Powerplay API asic_reset_mode_2 smu_switch_power_profile() - modifed arg0 to match Powerplay API switch_power_profile smu_set_mp1_state() - modifed arg0 to match Powerplay API set_mp1_state smu_set_df_cstate() - modifed arg0 to match Powerplay API set_df_cstate
smu_enable_mgpu_fan_boost() - modifed arg0 to match Powerplay API enable_mgpu_fan_boost
Other Changes
added above smu reset Powerplay functions to swsmu_dpm_funcs removed special smu handling of above functions and called through Powerplay API
--- drivers/gpu/drm/amd/pm/amdgpu_dpm.c | 46 +++++++---------------- drivers/gpu/drm/amd/pm/inc/amdgpu_smu.h | 12 +++--- drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c | 27 ++++++++++--- 3 files changed, 41 insertions(+), 44 deletions(-)
drivers/gpu/drm/amd/pm/amdgpu_dpm.c +14 -32
@@ -1059,12 +1059,10 @@ int amdgpu_dpm_set_mp1_state(struct amdgpu_device *adev, enum pp_mp1_state mp1_state) {int ret =0 ; +const struct amd_pm_funcs *pp_funcs = adev->powerplay.pp_funcs; -if (is_support_sw_smu (adev)) { - ret =smu_set_mp1_state (&adev->smu, mp1_state); - }else if (adev->powerplay.pp_funcs && - adev->powerplay.pp_funcs->set_mp1_state) { - ret = adev->powerplay.pp_funcs->set_mp1_state ( +if (pp_funcs && pp_funcs->set_mp1_state) { + ret = pp_funcs->set_mp1_state ( adev->powerplay.pp_handle, mp1_state); }
@@ -1096,16 +1094,11 @@ int amdgpu_dpm_mode2_reset(struct amdgpu_device *adev) {const struct amd_pm_funcs *pp_funcs = adev->powerplay.pp_funcs;void *pp_handle = adev->powerplay.pp_handle; -struct smu_context *smu = &adev->smu; -if (is_support_sw_smu (adev)) { -return smu_mode2_reset (smu); - }else { -if (!pp_funcs || !pp_funcs->asic_reset_mode_2) -return -ENOENT ; +if (!pp_funcs || !pp_funcs->asic_reset_mode_2) +return -ENOENT ; -return pp_funcs->asic_reset_mode_2 (pp_handle); - } +return pp_funcs->asic_reset_mode_2 (pp_handle); }int amdgpu_dpm_baco_reset (struct amdgpu_device *adev)
@@ -1166,16 +1159,14 @@ int amdgpu_dpm_switch_power_profile(struct amdgpu_device *adev, enum PP_SMC_POWER_PROFILE type, bool en) { +const struct amd_pm_funcs *pp_funcs = adev->powerplay.pp_funcs;int ret =0 ;if (amdgpu_sriov_vf (adev))return 0 ; -if (is_support_sw_smu (adev)) - ret =smu_switch_power_profile (&adev->smu, type, en); -else if (adev->powerplay.pp_funcs && - adev->powerplay.pp_funcs->switch_power_profile) - ret = adev->powerplay.pp_funcs->switch_power_profile ( +if (pp_funcs && pp_funcs->switch_power_profile) + ret = pp_funcs->switch_power_profile ( adev->powerplay.pp_handle, type, en);return ret;
@@ -1184,13 +1175,11 @@ int amdgpu_dpm_switch_power_profile(struct amdgpu_device *adev,int amdgpu_dpm_set_xgmi_pstate (struct amdgpu_device *adev,uint32_t pstate) { +const struct amd_pm_funcs *pp_funcs = adev->powerplay.pp_funcs;int ret =0 ; -if (is_support_sw_smu (adev)) - ret =smu_set_xgmi_pstate (&adev->smu, pstate); -else if (adev->powerplay.pp_funcs && - adev->powerplay.pp_funcs->set_xgmi_pstate) - ret = adev->powerplay.pp_funcs->set_xgmi_pstate (adev->powerplay.pp_handle, +if (pp_funcs && pp_funcs->set_xgmi_pstate) + ret = pp_funcs->set_xgmi_pstate (adev->powerplay.pp_handle, pstate);return ret;
@@ -1202,12 +1191,8 @@ int amdgpu_dpm_set_df_cstate(struct amdgpu_device *adev,int ret =0 ;const struct amd_pm_funcs *pp_funcs = adev->powerplay.pp_funcs;void *pp_handle = adev->powerplay.pp_handle; -struct smu_context *smu = &adev->smu; -if (is_support_sw_smu (adev)) - ret =smu_set_df_cstate (smu, cstate); -else if (pp_funcs && - pp_funcs->set_df_cstate) +if (pp_funcs && pp_funcs->set_df_cstate) ret = pp_funcs->set_df_cstate (pp_handle, cstate);return ret;
@@ -1228,12 +1213,9 @@ int amdgpu_dpm_enable_mgpu_fan_boost(struct amdgpu_device *adev)void *pp_handle = adev->powerplay.pp_handle;const struct amd_pm_funcs *pp_funcs = adev->powerplay.pp_funcs; -struct smu_context *smu = &adev->smu;int ret =0 ; -if (is_support_sw_smu (adev)) - ret =smu_enable_mgpu_fan_boost (smu); -else if (pp_funcs && pp_funcs->enable_mgpu_fan_boost) +if (pp_funcs && pp_funcs->enable_mgpu_fan_boost) ret = pp_funcs->enable_mgpu_fan_boost (pp_handle);return ret;
drivers/gpu/drm/amd/pm/inc/amdgpu_smu.h +6 -6
@@ -695,7 +695,7 @@ int smu_display_clock_voltage_request(struct smu_context *smu, struct pp_display_clock_request *clock_req);int smu_display_disable_memory_clock_switch (struct smu_context *smu,bool disable_memory_clock_switch); -int smu_set_xgmi_pstate (struct smu_context *smu, +int smu_set_xgmi_pstate (void *handle,uint32_t pstate);int smu_set_azalia_d3_pme (struct smu_context *smu);
@@ -709,7 +709,7 @@ int smu_baco_exit(struct smu_context *smu);bool smu_mode1_reset_is_support (struct smu_context *smu);int smu_mode1_reset (struct smu_context *smu); -int smu_mode2_reset (struct smu_context *smu); +int smu_mode2_reset (void *handle);extern const struct amd_ip_funcs smu_ip_funcs;
@@ -736,7 +736,7 @@ extern int smu_handle_task(struct smu_context *smu,enum amd_dpm_forced_level level, enum amd_pp_task task_id, bool lock_needed); -int smu_switch_power_profile (struct smu_context *smu, +int smu_switch_power_profile (void *handle,enum PP_SMC_POWER_PROFILE type,bool en); int smu_get_dpm_freq_range(struct smu_context *smu, enum smu_clk_type clk_type,
@@ -752,9 +752,9 @@ int smu_sys_set_pp_feature_mask(struct smu_context *smu, uint64_t new_mask);int smu_force_clk_levels (struct smu_context *smu,enum smu_clk_type clk_type,uint32_t mask); -int smu_set_mp1_state (struct smu_context *smu, +int smu_set_mp1_state (void *handle,enum pp_mp1_state mp1_state); -int smu_set_df_cstate (struct smu_context *smu, +int smu_set_df_cstate (void *handle,enum pp_df_cstate state);int smu_allow_xgmi_power_down (struct smu_context *smu,bool en);
@@ -772,7 +772,7 @@ int smu_get_status_gfxoff(struct amdgpu_device *adev, uint32_t *value);ssize_t smu_sys_get_gpu_metrics (struct smu_context *smu,void **table); -int smu_enable_mgpu_fan_boost (struct smu_context *smu); +int smu_enable_mgpu_fan_boost (void *handle);int smu_gfx_state_change_set (struct smu_context *smu,uint32_t state);#endif
drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c +21 -6
@@ -1538,10 +1538,11 @@ int smu_handle_task(struct smu_context *smu,return ret; } -int smu_switch_power_profile (struct smu_context *smu, +int smu_switch_power_profile (void *handle,enum PP_SMC_POWER_PROFILE type,bool en) { +struct smu_context *smu = handle;struct smu_dpm_context *smu_dpm_ctx = &(smu->smu_dpm);long workload;uint32_t index;
@@ -1667,9 +1668,10 @@ int smu_force_clk_levels(struct smu_context *smu,* However, the mp1 state setting should still be granted * even if the dpm_enabled cleared. */ -int smu_set_mp1_state (struct smu_context *smu, +int smu_set_mp1_state (void *handle,enum pp_mp1_state mp1_state) { +struct smu_context *smu = handle;uint16_t msg;int ret;
@@ -1706,9 +1708,10 @@ int smu_set_mp1_state(struct smu_context *smu,return ret; } -int smu_set_df_cstate (struct smu_context *smu, +int smu_set_df_cstate (void *handle,enum pp_df_cstate state) { +struct smu_context *smu = handle;int ret =0 ;if (!smu->pm_enabled || !smu->adev->pm.dpm_enabled)
@@ -2266,9 +2269,10 @@ int smu_display_disable_memory_clock_switch(struct smu_context *smu, bool disablreturn ret; } -int smu_set_xgmi_pstate (struct smu_context *smu, +int smu_set_xgmi_pstate (void *handle,uint32_t pstate) { +struct smu_context *smu = handle;int ret =0 ;if (!smu->pm_enabled || !smu->adev->pm.dpm_enabled)
@@ -2415,8 +2419,9 @@ int smu_mode1_reset(struct smu_context *smu)return ret; } -int smu_mode2_reset (struct smu_context *smu) +int smu_mode2_reset (void *handle) { +struct smu_context *smu = handle;int ret =0 ;if (!smu->pm_enabled)
@@ -2527,8 +2532,9 @@ ssize_t smu_sys_get_gpu_metrics(struct smu_context *smu,return size; } -int smu_enable_mgpu_fan_boost (struct smu_context *smu) +int smu_enable_mgpu_fan_boost (void *handle) { +struct smu_context *smu = handle;int ret =0 ;if (!smu->pm_enabled || !smu->adev->pm.dpm_enabled)
@@ -2557,5 +2563,14 @@ int smu_gfx_state_change_set(struct smu_context *smu, uint32_t state) }static const struct amd_pm_funcs swsmu_dpm_funcs = { +/* export for sysfs */ .get_performance_level = smu_get_performance_level, + .switch_power_profile = smu_switch_power_profile, +/* export to amdgpu */ + .set_mp1_state = smu_set_mp1_state, +/* export to DC */ + .enable_mgpu_fan_boost = smu_enable_mgpu_fan_boost, + .asic_reset_mode_2 = smu_mode2_reset, + .set_df_cstate = smu_set_df_cstate, + .set_xgmi_pstate = smu_set_xgmi_pstate, };
Signature · 6 lines
2.25.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 4/8 amdgpu/pm: Powerplay API for smu , changed 9 pm power functions to use API
In reply to Darren PowellModified Files
smu_get_power_limit() - modifed arg0 to match Powerplay API get_power_limit smu_set_power_limit() - modifed arg0 to match Powerplay API set_power_limit smu_sys_get_pp_table() - modifed signature to match Powerplay API get_pp_table smu_get_power_num_states() - modifed arg0 to match Powerplay API get_pp_num_states
smu_get_current_power_state() - modifed arg0 to match Powerplay API get_current_power_state smu_sys_get_pp_feature_mask() - modifed signature to match Powerplay API get_ppfeature_status smu_sys_set_pp_feature_mask() - modifed arg0 to match Powerplay API set_ppfeature_status
Other Changes
added 7 above smu Powerplay functions to swsmu_dpm_funcs
removed special smu handling of above functions and called through Powerplay API
--- drivers/gpu/drm/amd/pm/amdgpu_pm.c | 73 ++++++++--------------- drivers/gpu/drm/amd/pm/inc/amdgpu_smu.h | 16 +++-- drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c | 59 +++++++++++------- 3 files changed, 69 insertions(+), 79 deletions(-)
drivers/gpu/drm/amd/pm/amdgpu_pm.c +26 -47
@@ -124,6 +124,7 @@ static ssize_t amdgpu_get_power_dpm_state(struct device *dev, {struct drm_device *ddev =dev_get_drvdata (dev);struct amdgpu_device *adev =drm_to_adev (ddev); +const struct amd_pm_funcs *pp_funcs = adev->powerplay.pp_funcs;enum amd_pm_state_type pm;int ret;
@@ -136,12 +137,7 @@ static ssize_t amdgpu_get_power_dpm_state(struct device *dev,return ret; } -if (is_support_sw_smu (adev)) { -if (adev->smu.ppt_funcs->get_current_power_state) - pm =smu_get_current_power_state (&adev->smu); -else - pm = adev->pm.dpm.user_state; - }else if (adev->powerplay.pp_funcs->get_current_power_state) { +if (pp_funcs->get_current_power_state) { pm =amdgpu_dpm_get_current_power_state (adev); }else { pm = adev->pm.dpm.user_state;
@@ -307,6 +303,7 @@ static ssize_t amdgpu_set_power_dpm_force_performance_level(struct device *dev, {struct drm_device *ddev =dev_get_drvdata (dev);struct amdgpu_device *adev =drm_to_adev (ddev); +const struct amd_pm_funcs *pp_funcs = adev->powerplay.pp_funcs;enum amd_dpm_forced_level level;enum amd_dpm_forced_level current_level =0xff ;int ret =0 ;
@@ -342,9 +339,7 @@ static ssize_t amdgpu_set_power_dpm_force_performance_level(struct device *dev,return ret; } -if (is_support_sw_smu (adev)) - current_level =smu_get_performance_level (&adev->smu); -else if (adev->powerplay.pp_funcs->get_performance_level) +if (pp_funcs->get_performance_level) current_level =amdgpu_dpm_get_performance_level (adev);if (current_level == level) {
@@ -381,7 +376,7 @@ static ssize_t amdgpu_set_power_dpm_force_performance_level(struct device *dev,pm_runtime_put_autosuspend (ddev->dev);return -EINVAL ; } - }else if (adev->powerplay.pp_funcs->force_performance_level) { + }else if (pp_funcs->force_performance_level) {mutex_lock (&adev->pm.mutex);if (adev->pm.dpm.thermal_active) {mutex_unlock (&adev->pm.mutex);
@@ -412,6 +407,7 @@ static ssize_t amdgpu_get_pp_num_states(struct device *dev, {struct drm_device *ddev =dev_get_drvdata (dev);struct amdgpu_device *adev =drm_to_adev (ddev); +const struct amd_pm_funcs *pp_funcs = adev->powerplay.pp_funcs;struct pp_states_info data;int i, buf_len, ret;
@@ -424,12 +420,10 @@ static ssize_t amdgpu_get_pp_num_states(struct device *dev,return ret; } -if (is_support_sw_smu (adev)) { - ret =smu_get_power_num_states (&adev->smu, &data); -if (ret) +if (pp_funcs->get_pp_num_states) { + ret =amdgpu_dpm_get_pp_num_states (adev, &data); +if (is_support_sw_smu (adev) && ret)return ret; - }else if (adev->powerplay.pp_funcs->get_pp_num_states) { -amdgpu_dpm_get_pp_num_states (adev, &data); }else {memset (&data,0 ,sizeof (data)); }
@@ -454,8 +448,8 @@ static ssize_t amdgpu_get_pp_cur_state(struct device *dev, {struct drm_device *ddev =dev_get_drvdata (dev);struct amdgpu_device *adev =drm_to_adev (ddev); +const struct amd_pm_funcs *pp_funcs = adev->powerplay.pp_funcs;struct pp_states_info data; -struct smu_context *smu = &adev->smu;enum amd_pm_state_type pm =0 ;int i =0 , ret =0 ;
@@ -468,15 +462,13 @@ static ssize_t amdgpu_get_pp_cur_state(struct device *dev,return ret; } -if (is_support_sw_smu (adev)) { - pm =smu_get_current_power_state (smu); - ret =smu_get_power_num_states (smu, &data); -if (ret) -return ret; - }else if (adev->powerplay.pp_funcs->get_current_power_state - && adev->powerplay.pp_funcs->get_pp_num_states) { +if (pp_funcs->get_current_power_state + && pp_funcs->get_pp_num_states) { pm =amdgpu_dpm_get_current_power_state (adev); -amdgpu_dpm_get_pp_num_states (adev, &data); + ret =amdgpu_dpm_get_pp_num_states (adev, &data); + +if (is_support_sw_smu (adev) && ret) +return ret; }pm_runtime_mark_last_busy (ddev->dev);
@@ -589,13 +581,7 @@ static ssize_t amdgpu_get_pp_table(struct device *dev,return ret; } -if (is_support_sw_smu (adev)) { - size =smu_sys_get_pp_table (&adev->smu, (void **)&table); -pm_runtime_mark_last_busy (ddev->dev); -pm_runtime_put_autosuspend (ddev->dev); -if (size <0 ) -return size; - }else if (adev->powerplay.pp_funcs->get_pp_table) { +if (adev->powerplay.pp_funcs->get_pp_table) { size =amdgpu_dpm_get_pp_table (adev, &table);pm_runtime_mark_last_busy (ddev->dev);pm_runtime_put_autosuspend (ddev->dev);
@@ -989,9 +975,7 @@ static ssize_t amdgpu_get_pp_features(struct device *dev,return ret; } -if (is_support_sw_smu (adev)) - size =smu_sys_get_pp_feature_mask (&adev->smu, buf); -else if (adev->powerplay.pp_funcs->get_ppfeature_status) +if (adev->powerplay.pp_funcs->get_ppfeature_status) size =amdgpu_dpm_get_ppfeature_status (adev, buf);else size =snprintf (buf,PAGE_SIZE ,"\n" );
@@ -2862,6 +2846,7 @@ static ssize_t amdgpu_hwmon_show_power_cap_max(struct device *dev, char *buf) {struct amdgpu_device *adev =dev_get_drvdata (dev); +const struct amd_pm_funcs *pp_funcs = adev->powerplay.pp_funcs;uint32_t limit =0 ;ssize_t size;int r;
@@ -2875,10 +2860,7 @@ static ssize_t amdgpu_hwmon_show_power_cap_max(struct device *dev,return r; } -if (is_support_sw_smu (adev)) { -smu_get_power_limit (&adev->smu, &limit, true); - size =snprintf (buf,PAGE_SIZE ,"%u\n" , limit *1000000 ); - }else if (adev->powerplay.pp_funcs && adev->powerplay.pp_funcs->get_power_limit) { +if (pp_funcs && pp_funcs->get_power_limit) { adev->powerplay.pp_funcs->get_power_limit (adev->powerplay.pp_handle, &limit, true); size =snprintf (buf,PAGE_SIZE ,"%u\n" , limit *1000000 ); }else {
@@ -2896,6 +2878,7 @@ static ssize_t amdgpu_hwmon_show_power_cap(struct device *dev, char *buf) {struct amdgpu_device *adev =dev_get_drvdata (dev); +const struct amd_pm_funcs *pp_funcs = adev->powerplay.pp_funcs;uint32_t limit =0 ;ssize_t size;int r;
@@ -2909,11 +2892,8 @@ static ssize_t amdgpu_hwmon_show_power_cap(struct device *dev,return r; } -if (is_support_sw_smu (adev)) { -smu_get_power_limit (&adev->smu, &limit, false); - size =snprintf (buf,PAGE_SIZE ,"%u\n" , limit *1000000 ); - }else if (adev->powerplay.pp_funcs && adev->powerplay.pp_funcs->get_power_limit) { - adev->powerplay.pp_funcs->get_power_limit (adev->powerplay.pp_handle, &limit, false); +if (pp_funcs && pp_funcs->get_power_limit) { + pp_funcs->get_power_limit (adev->powerplay.pp_handle, &limit, false); size =snprintf (buf,PAGE_SIZE ,"%u\n" , limit *1000000 ); }else { size =snprintf (buf,PAGE_SIZE ,"\n" );
@@ -2932,6 +2912,7 @@ static ssize_t amdgpu_hwmon_set_power_cap(struct device *dev, size_t count) {struct amdgpu_device *adev =dev_get_drvdata (dev); +const struct amd_pm_funcs *pp_funcs = adev->powerplay.pp_funcs;int err;u32 value;
@@ -2954,10 +2935,8 @@ static ssize_t amdgpu_hwmon_set_power_cap(struct device *dev,return err; } -if (is_support_sw_smu (adev)) - err =smu_set_power_limit (&adev->smu, value); -else if (adev->powerplay.pp_funcs && adev->powerplay.pp_funcs->set_power_limit) - err = adev->powerplay.pp_funcs->set_power_limit (adev->powerplay.pp_handle, value); +if (pp_funcs && pp_funcs->set_power_limit) + err = pp_funcs->set_power_limit (adev->powerplay.pp_handle, value);else err = -EINVAL ;
drivers/gpu/drm/amd/pm/inc/amdgpu_smu.h +7 -9
@@ -659,11 +659,9 @@ int smu_set_gfx_cgpg(struct smu_context *smu, bool enabled);int smu_set_fan_speed_rpm (void *handle,uint32_t speed); -int smu_get_power_limit (struct smu_context *smu, -uint32_t *limit, -bool max_setting); +int smu_get_power_limit (void *handle,uint32_t *limit,bool max_setting); -int smu_set_power_limit (struct smu_context *smu,uint32_t limit); +int smu_set_power_limit (void *handle,uint32_t limit);int smu_print_clk_levels (struct smu_context *smu,enum smu_clk_type clk_type,char *buf); int smu_od_edit_dpm_table(struct smu_context *smu,
@@ -718,10 +716,10 @@ extern const struct amdgpu_ip_block_version smu_v12_0_ip_block;bool is_support_sw_smu (struct amdgpu_device *adev);int smu_reset (struct smu_context *smu); -int smu_sys_get_pp_table (struct smu_context *smu,void **table); +int smu_sys_get_pp_table (void *handle,char **table);int smu_sys_set_pp_table (struct smu_context *smu,void *buf,size_t size); -int smu_get_power_num_states (struct smu_context *smu,struct pp_states_info *state_info); -enum amd_pm_state_type smu_get_current_power_state (struct smu_context *smu); +int smu_get_power_num_states (void *handle,struct pp_states_info *state_info); +enum amd_pm_state_type smu_get_current_power_state (void *handle);int smu_write_watermarks_table (struct smu_context *smu); int smu_set_watermarks_for_clock_ranges( struct smu_context *smu,
@@ -747,8 +745,8 @@ enum amd_dpm_forced_level smu_get_performance_level(void *handle);int smu_force_performance_level (struct smu_context *smu,enum amd_dpm_forced_level level);int smu_set_display_count (struct smu_context *smu,uint32_t count);int smu_set_ac_dc (struct smu_context *smu); -size_t smu_sys_get_pp_feature_mask (struct smu_context *smu,char *buf); -int smu_sys_set_pp_feature_mask (struct smu_context *smu,uint64_t new_mask); +int smu_sys_get_pp_feature_mask (void *handle,char *buf); +int smu_sys_set_pp_feature_mask (void *handle,uint64_t new_mask);int smu_force_clk_levels (struct smu_context *smu,enum smu_clk_type clk_type,uint32_t mask);
drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c +36 -23
113 lines not on this page · raw message
Signature · 6 lines
2.25.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 5/8 amdgpu/pm: Powerplay API for smu , changed 5 dpm powergating & sensor functions to use API
In reply to Darren PowellNew Functions
smu_get_baco_capability() - Implement Powerplay API get_asic_baco_capability
smu_baco_set_state() - Implement Powerplay API set_asic_baco_state
Modified Functions
smu_read_sensor() - modifed signature to match Powerplay API read_sensor
Other Changes
added 3 above smu Powerplay functions to swsmu_dpm_funcs
removed special smu handling in 5 dpm functions and called through Powerplay API
--- drivers/gpu/drm/amd/pm/amdgpu_dpm.c | 86 ++++++++--------------- drivers/gpu/drm/amd/pm/inc/amdgpu_smu.h | 7 +- drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c | 72 +++++++++++++++++-- 3 files changed, 100 insertions(+), 65 deletions(-)
drivers/gpu/drm/amd/pm/amdgpu_dpm.c +28 -58
@@ -1019,18 +1019,13 @@ int amdgpu_dpm_baco_enter(struct amdgpu_device *adev) {const struct amd_pm_funcs *pp_funcs = adev->powerplay.pp_funcs;void *pp_handle = adev->powerplay.pp_handle; -struct smu_context *smu = &adev->smu;int ret =0 ; -if (is_support_sw_smu (adev)) { - ret =smu_baco_enter (smu); - }else { -if (!pp_funcs || !pp_funcs->set_asic_baco_state) -return -ENOENT ; +if (!pp_funcs || !pp_funcs->set_asic_baco_state) +return -ENOENT ; -/* enter BACO state */ - ret = pp_funcs->set_asic_baco_state (pp_handle,1 ); - } +/* enter BACO state */ + ret = pp_funcs->set_asic_baco_state (pp_handle,1 );return ret; }
@@ -1039,18 +1034,13 @@ int amdgpu_dpm_baco_exit(struct amdgpu_device *adev) {const struct amd_pm_funcs *pp_funcs = adev->powerplay.pp_funcs;void *pp_handle = adev->powerplay.pp_handle; -struct smu_context *smu = &adev->smu;int ret =0 ; -if (is_support_sw_smu (adev)) { - ret =smu_baco_exit (smu); - }else { -if (!pp_funcs || !pp_funcs->set_asic_baco_state) -return -ENOENT ; +if (!pp_funcs || !pp_funcs->set_asic_baco_state) +return -ENOENT ; -/* exit BACO state */ - ret = pp_funcs->set_asic_baco_state (pp_handle,0 ); - } +/* exit BACO state */ + ret = pp_funcs->set_asic_baco_state (pp_handle,0 );return ret; }
@@ -1074,20 +1064,15 @@ bool amdgpu_dpm_is_baco_supported(struct amdgpu_device *adev) {const struct amd_pm_funcs *pp_funcs = adev->powerplay.pp_funcs;void *pp_handle = adev->powerplay.pp_handle; -struct smu_context *smu = &adev->smu;bool baco_cap; -if (is_support_sw_smu (adev)) { -return smu_baco_is_support (smu); - }else { -if (!pp_funcs || !pp_funcs->get_asic_baco_capability) -return false; +if (!pp_funcs || !pp_funcs->get_asic_baco_capability) +return false; -if (pp_funcs->get_asic_baco_capability (pp_handle, &baco_cap)) -return false; +if (pp_funcs->get_asic_baco_capability (pp_handle, &baco_cap)) +return false; -return baco_cap ? true : false; - } +return baco_cap; }int amdgpu_dpm_mode2_reset (struct amdgpu_device *adev)
@@ -1105,32 +1090,20 @@ int amdgpu_dpm_baco_reset(struct amdgpu_device *adev) {const struct amd_pm_funcs *pp_funcs = adev->powerplay.pp_funcs;void *pp_handle = adev->powerplay.pp_handle; -struct smu_context *smu = &adev->smu;int ret =0 ; -if (is_support_sw_smu (adev)) { - ret =smu_baco_enter (smu); -if (ret) -return ret; - - ret =smu_baco_exit (smu); -if (ret) -return ret; - }else { -if (!pp_funcs - || !pp_funcs->set_asic_baco_state) -return -ENOENT ; +if (!pp_funcs || !pp_funcs->set_asic_baco_state) +return -ENOENT ; -/* enter BACO state */ - ret = pp_funcs->set_asic_baco_state (pp_handle,1 ); -if (ret) -return ret; +/* enter BACO state */ + ret = pp_funcs->set_asic_baco_state (pp_handle,1 ); +if (ret) +return ret; -/* exit BACO state */ - ret = pp_funcs->set_asic_baco_state (pp_handle,0 ); -if (ret) -return ret; - } +/* exit BACO state */ + ret = pp_funcs->set_asic_baco_state (pp_handle,0 ); +if (ret) +return ret;return 0 ; }
@@ -1272,20 +1245,17 @@ void amdgpu_pm_acpi_event_handler(struct amdgpu_device *adev)int amdgpu_dpm_read_sensor (struct amdgpu_device *adev,enum amd_pp_sensors sensor,void *data,uint32_t *size) { +const struct amd_pm_funcs *pp_funcs = adev->powerplay.pp_funcs;int ret =0 ;if (!data || !size)return -EINVAL ; -if (is_support_sw_smu (adev)) - ret =smu_read_sensor (&adev->smu, sensor, data, size); -else { -if (adev->powerplay.pp_funcs && adev->powerplay.pp_funcs->read_sensor) - ret = adev->powerplay.pp_funcs->read_sensor ((adev)->powerplay.pp_handle, +if (pp_funcs && pp_funcs->read_sensor) + ret = pp_funcs->read_sensor ((adev)->powerplay.pp_handle, sensor, data, size); -else - ret = -EINVAL ; - } +else + ret = -EINVAL ;return ret; }
drivers/gpu/drm/amd/pm/inc/amdgpu_smu.h +4 -3
@@ -668,9 +668,7 @@ int smu_od_edit_dpm_table(struct smu_context *smu,enum PP_OD_DPM_TABLE_COMMAND type, long *input, uint32_t size); -int smu_read_sensor (struct smu_context *smu, -enum amd_pp_sensors sensor, -void *data,uint32_t *size); +int smu_read_sensor (void *handle,int sensor,void *data,int *size);int smu_get_power_profile_mode (struct smu_context *smu,char *buf); int smu_set_power_profile_mode(struct smu_context *smu,
@@ -699,11 +697,14 @@ int smu_set_xgmi_pstate(void *handle,int smu_set_azalia_d3_pme (struct smu_context *smu);bool smu_baco_is_support (struct smu_context *smu); +int smu_get_baco_capability (void *handle,bool *cap);int smu_baco_get_state (struct smu_context *smu,enum smu_baco_state *state);int smu_baco_enter (struct smu_context *smu);int smu_baco_exit (struct smu_context *smu); +int smu_baco_set_state (void *handle,int state); +bool smu_mode1_reset_is_support (struct smu_context *smu);int smu_mode1_reset (struct smu_context *smu);
drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c +68 -4
118 lines not on this page · raw message
Signature · 6 lines
2.25.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 7/8 amdgpu/pm: Powerplay API for smu , changed 4 dpm functions to use API
In reply to Darren PowellNew Functions
smu_get_mclk - implementation of the Powerplay API function get_mclk
smu_get_sclk - implementation of the Powerplay API function get_sclk
smu_handle_dpm_task - implementation of the Powerplay API function dispatch_tasks
Modified Functions
smu_dpm_set_power_gate - - modifed arg0 to match Powerplay API set_powergating_by_smu
Other Changes
removed special smu handling in dpm functions and called through Powerplay API call to smu_dpm_set_power_gate via Powerplay API now locks mutex for UVD and VCE
--- drivers/gpu/drm/amd/pm/amdgpu_dpm.c | 94 ++++++++--------------- drivers/gpu/drm/amd/pm/inc/amdgpu_smu.h | 7 +- drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c | 47 +++++++++++- 3 files changed, 82 insertions(+), 66 deletions(-)
drivers/gpu/drm/amd/pm/amdgpu_dpm.c +31 -63
@@ -911,50 +911,28 @@ amdgpu_get_vce_clock_state(void *handle, u32 idx)int amdgpu_dpm_get_sclk (struct amdgpu_device *adev,bool low) { -uint32_t clk_freq; -int ret =0 ; -if (is_support_sw_smu (adev)) { - ret =smu_get_dpm_freq_range (&adev->smu,SMU_GFXCLK , - low ? &clk_freq :NULL , - !low ? &clk_freq :NULL ); -if (ret) -return 0 ; -return clk_freq *100 ; +const struct amd_pm_funcs *pp_funcs = adev->powerplay.pp_funcs; - }else { -return (adev)->powerplay.pp_funcs->get_sclk ((adev)->powerplay.pp_handle, (low)); - } +return pp_funcs->get_sclk ((adev)->powerplay.pp_handle, (low)); }int amdgpu_dpm_get_mclk (struct amdgpu_device *adev,bool low) { -uint32_t clk_freq; -int ret =0 ; -if (is_support_sw_smu (adev)) { - ret =smu_get_dpm_freq_range (&adev->smu,SMU_UCLK , - low ? &clk_freq :NULL , - !low ? &clk_freq :NULL ); -if (ret) -return 0 ; -return clk_freq *100 ; +const struct amd_pm_funcs *pp_funcs = adev->powerplay.pp_funcs; - }else { -return (adev)->powerplay.pp_funcs->get_mclk ((adev)->powerplay.pp_handle, (low)); - } +return pp_funcs->get_mclk ((adev)->powerplay.pp_handle, (low)); }int amdgpu_dpm_set_powergating_by_smu (struct amdgpu_device *adev,uint32_t block_type,bool gate) {int ret =0 ; +const struct amd_pm_funcs *pp_funcs = adev->powerplay.pp_funcs;bool swsmu =is_support_sw_smu (adev);switch (block_type) {case AMD_IP_BLOCK_TYPE_UVD :case AMD_IP_BLOCK_TYPE_VCE : -if (swsmu) { - ret =smu_dpm_set_power_gate (&adev->smu, block_type, gate); - }else if (adev->powerplay.pp_funcs && - adev->powerplay.pp_funcs->set_powergating_by_smu) { +if (pp_funcs && pp_funcs->set_powergating_by_smu) {/* * TODO: need a better lock mechanism *
@@ -982,7 +960,7 @@ int amdgpu_dpm_set_powergating_by_smu(struct amdgpu_device *adev, uint32_t block* amdgpu_set_dpm_forced_performance_level+0x129/0x330 [amdgpu] */ mutex_lock (&adev->pm.mutex); - ret = ((adev)->powerplay.pp_funcs->set_powergating_by_smu ( + ret = (pp_funcs->set_powergating_by_smu ( (adev)->powerplay.pp_handle, block_type, gate));mutex_unlock (&adev->pm.mutex); }
@@ -990,12 +968,10 @@ int amdgpu_dpm_set_powergating_by_smu(struct amdgpu_device *adev, uint32_t blockcase AMD_IP_BLOCK_TYPE_GFX :case AMD_IP_BLOCK_TYPE_VCN :case AMD_IP_BLOCK_TYPE_SDMA : -if (swsmu) - ret =smu_dpm_set_power_gate (&adev->smu, block_type, gate); -else if (adev->powerplay.pp_funcs && - adev->powerplay.pp_funcs->set_powergating_by_smu) - ret = ((adev)->powerplay.pp_funcs->set_powergating_by_smu ( +if (pp_funcs && pp_funcs->set_powergating_by_smu) { + ret = (pp_funcs->set_powergating_by_smu ( (adev)->powerplay.pp_handle, block_type, gate)); + }break ;case AMD_IP_BLOCK_TYPE_JPEG :if (swsmu)
@@ -1003,10 +979,10 @@ int amdgpu_dpm_set_powergating_by_smu(struct amdgpu_device *adev, uint32_t blockbreak ;case AMD_IP_BLOCK_TYPE_GMC :case AMD_IP_BLOCK_TYPE_ACP : -if (adev->powerplay.pp_funcs && - adev->powerplay.pp_funcs->set_powergating_by_smu) - ret = ((adev)->powerplay.pp_funcs->set_powergating_by_smu ( +if (pp_funcs && pp_funcs->set_powergating_by_smu) { + ret = (pp_funcs->set_powergating_by_smu ( (adev)->powerplay.pp_handle, block_type, gate)); + }break ;default :break ;
@@ -1512,36 +1488,28 @@ void amdgpu_pm_compute_clocks(struct amdgpu_device *adev)amdgpu_fence_wait_empty (ring); } -if (is_support_sw_smu (adev)) { -struct smu_dpm_context *smu_dpm = &adev->smu.smu_dpm; -smu_handle_task (&adev->smu, - smu_dpm->dpm_level, -AMD_PP_TASK_DISPLAY_CONFIG_CHANGE , - true); - }else { -if (adev->powerplay.pp_funcs->dispatch_tasks) { -if (!amdgpu_device_has_dc_support (adev)) { -mutex_lock (&adev->pm.mutex); -amdgpu_dpm_get_active_displays (adev); - adev->pm.pm_display_cfg.num_display = adev->pm.dpm.new_active_crtc_count; - adev->pm.pm_display_cfg.vrefresh =amdgpu_dpm_get_vrefresh (adev); - adev->pm.pm_display_cfg.min_vblank_time =amdgpu_dpm_get_vblank_time (adev); -/* we have issues with mclk switching with refresh rates over 120 hz on the non-DC code. */ -if (adev->pm.pm_display_cfg.vrefresh >120 ) - adev->pm.pm_display_cfg.min_vblank_time =0 ; -if (adev->powerplay.pp_funcs->display_configuration_change) - adev->powerplay.pp_funcs->display_configuration_change ( - adev->powerplay.pp_handle, - &adev->pm.pm_display_cfg); -mutex_unlock (&adev->pm.mutex); - } -amdgpu_dpm_dispatch_task (adev,AMD_PP_TASK_DISPLAY_CONFIG_CHANGE ,NULL ); - }else { +if (adev->powerplay.pp_funcs->dispatch_tasks) { +if (!amdgpu_device_has_dc_support (adev)) {mutex_lock (&adev->pm.mutex);amdgpu_dpm_get_active_displays (adev); -amdgpu_dpm_change_power_state_locked (adev); + adev->pm.pm_display_cfg.num_display = adev->pm.dpm.new_active_crtc_count; + adev->pm.pm_display_cfg.vrefresh =amdgpu_dpm_get_vrefresh (adev); + adev->pm.pm_display_cfg.min_vblank_time =amdgpu_dpm_get_vblank_time (adev); +/* we have issues with mclk switching with refresh rates over 120 hz on the non-DC code. */ +if (adev->pm.pm_display_cfg.vrefresh >120 ) + adev->pm.pm_display_cfg.min_vblank_time =0 ; +if (adev->powerplay.pp_funcs->display_configuration_change) + adev->powerplay.pp_funcs->display_configuration_change ( + adev->powerplay.pp_handle, + &adev->pm.pm_display_cfg);mutex_unlock (&adev->pm.mutex); } +amdgpu_dpm_dispatch_task (adev,AMD_PP_TASK_DISPLAY_CONFIG_CHANGE ,NULL ); + }else { +mutex_lock (&adev->pm.mutex); +amdgpu_dpm_get_active_displays (adev); +amdgpu_dpm_change_power_state_locked (adev); +mutex_unlock (&adev->pm.mutex); } }
drivers/gpu/drm/amd/pm/inc/amdgpu_smu.h +6 -1
@@ -727,16 +727,21 @@ int smu_set_watermarks_for_clock_ranges(extern int smu_display_configuration_change (struct smu_context *smu,const struct amd_pp_display_configuration *display_config); -extern int smu_dpm_set_power_gate (struct smu_context *smu,uint32_t block_type,bool gate); +extern int smu_dpm_set_power_gate (void *handle,uint32_t block_type,bool gate);extern int smu_handle_task (struct smu_context *smu,enum amd_dpm_forced_level level,enum amd_pp_task task_id,bool lock_needed); +extern int smu_handle_dpm_task (void *handle, +enum amd_pp_task task_id, +enum amd_pm_state_type *user_state);int smu_switch_power_profile (void *handle,enum PP_SMC_POWER_PROFILE type,bool en);int smu_get_dpm_freq_range (struct smu_context *smu,enum smu_clk_type clk_type,uint32_t *min,uint32_t *max); +u32 smu_get_mclk (void *handle,bool low); +u32 smu_get_sclk (void *handle,bool low);int smu_set_soft_freq_range (struct smu_context *smu,enum smu_clk_type clk_type,uint32_t min,uint32_t max);enum amd_dpm_forced_level smu_get_performance_level (void *handle);
drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c +45 -2
83 lines not on this page · raw message
Signature · 6 lines
2.25.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 8/8 amdgpu/pm: Powerplay API for smu , updates to some pm functions
In reply to Darren PowellModified Functions
smu_sys_set_pp_table() - modifed signature to match Powerplay API set_pp_table
smu_force_performance_level() - modifed arg0 to match Powerplay API force_performance_level
smu_od_edit_dpm_table() - modifed arg0 to match Powerplay API odn_edit_dpm_table
Other Changes
smu_od_edit_dpm_table() - removed call to task(READJUST_POWER_STATE) after COMMIT_TABLE,
now handled in calling function
amdgpu_set_power_dpm_force_performance_level() - now checks thermal for swsmu systems before trying to change level amdgpu_set_pp_od_clk_voltage() - now attempts to set fine_grain_clock_vol before swsmu edit dpm table
--- drivers/gpu/drm/amd/pm/amdgpu_pm.c | 94 ++++++++--------------- drivers/gpu/drm/amd/pm/inc/amdgpu_smu.h | 6 +- drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c | 17 ++-- 3 files changed, 46 insertions(+), 71 deletions(-)
drivers/gpu/drm/amd/pm/amdgpu_pm.c +34 -60
@@ -369,14 +369,7 @@ static ssize_t amdgpu_set_power_dpm_force_performance_level(struct device *dev,return -EINVAL ; } -if (is_support_sw_smu (adev)) { - ret =smu_force_performance_level (&adev->smu, level); -if (ret) { -pm_runtime_mark_last_busy (ddev->dev); -pm_runtime_put_autosuspend (ddev->dev); -return -EINVAL ; - } - }else if (pp_funcs->force_performance_level) { +if (pp_funcs->force_performance_level) {mutex_lock (&adev->pm.mutex);if (adev->pm.dpm.thermal_active) {mutex_unlock (&adev->pm.mutex);
@@ -619,15 +612,12 @@ static ssize_t amdgpu_set_pp_table(struct device *dev,return ret; } -if (is_support_sw_smu (adev)) { - ret =smu_sys_set_pp_table (&adev->smu, (void *)buf, count); -if (ret) { -pm_runtime_mark_last_busy (ddev->dev); -pm_runtime_put_autosuspend (ddev->dev); -return ret; - } - }else if (adev->powerplay.pp_funcs->set_pp_table) -amdgpu_dpm_set_pp_table (adev, buf, count); + ret =amdgpu_dpm_set_pp_table (adev, buf, count); +if (ret) { +pm_runtime_mark_last_busy (ddev->dev); +pm_runtime_put_autosuspend (ddev->dev); +return ret; + }pm_runtime_mark_last_busy (ddev->dev);pm_runtime_put_autosuspend (ddev->dev);
@@ -807,53 +797,42 @@ static ssize_t amdgpu_set_pp_od_clk_voltage(struct device *dev,return ret; } -if (is_support_sw_smu (adev)) { - ret =smu_od_edit_dpm_table (&adev->smu, type, - parameter, parameter_size); - +if (adev->powerplay.pp_funcs->set_fine_grain_clk_vol) { + ret =amdgpu_dpm_set_fine_grain_clk_vol (adev, type, + parameter, + parameter_size);if (ret) {pm_runtime_mark_last_busy (ddev->dev);pm_runtime_put_autosuspend (ddev->dev);return -EINVAL ; } - }else { - -if (adev->powerplay.pp_funcs->set_fine_grain_clk_vol) { - ret =amdgpu_dpm_set_fine_grain_clk_vol (adev, type, - parameter, - parameter_size); -if (ret) { -pm_runtime_mark_last_busy (ddev->dev); -pm_runtime_put_autosuspend (ddev->dev); -return -EINVAL ; - } - } + } -if (adev->powerplay.pp_funcs->odn_edit_dpm_table) { - ret =amdgpu_dpm_odn_edit_dpm_table (adev, type, - parameter, parameter_size); -if (ret) { -pm_runtime_mark_last_busy (ddev->dev); -pm_runtime_put_autosuspend (ddev->dev); -return -EINVAL ; - } +if (adev->powerplay.pp_funcs->odn_edit_dpm_table) { + ret =amdgpu_dpm_odn_edit_dpm_table (adev, type, + parameter, parameter_size); +if (ret) { +pm_runtime_mark_last_busy (ddev->dev); +pm_runtime_put_autosuspend (ddev->dev); +return -EINVAL ; } + } -if (type ==PP_OD_COMMIT_DPM_TABLE ) { -if (adev->powerplay.pp_funcs->dispatch_tasks) { -amdgpu_dpm_dispatch_task (adev, -AMD_PP_TASK_READJUST_POWER_STATE , -NULL ); -pm_runtime_mark_last_busy (ddev->dev); -pm_runtime_put_autosuspend (ddev->dev); -return count; - }else { -pm_runtime_mark_last_busy (ddev->dev); -pm_runtime_put_autosuspend (ddev->dev); -return -EINVAL ; - } +if (type ==PP_OD_COMMIT_DPM_TABLE ) { +if (adev->powerplay.pp_funcs->dispatch_tasks) { +amdgpu_dpm_dispatch_task (adev, +AMD_PP_TASK_READJUST_POWER_STATE , +NULL ); +pm_runtime_mark_last_busy (ddev->dev); +pm_runtime_put_autosuspend (ddev->dev); +return count; + }else { +pm_runtime_mark_last_busy (ddev->dev); +pm_runtime_put_autosuspend (ddev->dev); +return -EINVAL ; } } +pm_runtime_mark_last_busy (ddev->dev);pm_runtime_put_autosuspend (ddev->dev);
@@ -878,12 +857,7 @@ static ssize_t amdgpu_get_pp_od_clk_voltage(struct device *dev,return ret; } -if (is_support_sw_smu (adev)) { - size =smu_print_ppclk_levels (&adev->smu,OD_SCLK , buf); - size +=smu_print_ppclk_levels (&adev->smu,OD_MCLK , buf+size); - size +=smu_print_ppclk_levels (&adev->smu,OD_VDDC_CURVE , buf+size); - size +=smu_print_ppclk_levels (&adev->smu,OD_RANGE , buf+size); - }else if (adev->powerplay.pp_funcs->print_clock_levels) { +if (adev->powerplay.pp_funcs->print_clock_levels) { size =amdgpu_dpm_print_clock_levels (adev,OD_SCLK , buf); size +=amdgpu_dpm_print_clock_levels (adev,OD_MCLK , buf+size); size +=amdgpu_dpm_print_clock_levels (adev,OD_VDDC_CURVE , buf+size);
drivers/gpu/drm/amd/pm/inc/amdgpu_smu.h +3 -3
@@ -664,7 +664,7 @@ int smu_get_power_limit(void *handle, uint32_t *limit, bool max_setting);int smu_set_power_limit (void *handle,uint32_t limit);int smu_print_ppclk_levels (void *handle,enum pp_clock_type type,char *buf); -int smu_od_edit_dpm_table (struct smu_context *smu, +int smu_od_edit_dpm_table (void *handle,enum PP_OD_DPM_TABLE_COMMAND type,long *input,uint32_t size);
@@ -715,7 +715,7 @@ extern const struct amdgpu_ip_block_version smu_v12_0_ip_block;bool is_support_sw_smu (struct amdgpu_device *adev);int smu_reset (struct smu_context *smu);int smu_sys_get_pp_table (void *handle,char **table); -int smu_sys_set_pp_table (struct smu_context *smu,void *buf,size_t size); +int smu_sys_set_pp_table (void *handle,const char *buf,size_t size);int smu_get_power_num_states (void *handle,struct pp_states_info *state_info);enum amd_pm_state_type smu_get_current_power_state (void *handle);int smu_write_watermarks_table (struct smu_context *smu);
@@ -745,7 +745,7 @@ u32 smu_get_sclk(void *handle, bool low);int smu_set_soft_freq_range (struct smu_context *smu,enum smu_clk_type clk_type,uint32_t min,uint32_t max);enum amd_dpm_forced_level smu_get_performance_level (void *handle); -int smu_force_performance_level (struct smu_context *smu,enum amd_dpm_forced_level level); +int smu_force_performance_level (void *handle,enum amd_dpm_forced_level level);int smu_set_display_count (struct smu_context *smu,uint32_t count);int smu_set_ac_dc (struct smu_context *smu);int smu_sys_get_pp_feature_mask (void *handle,char *buf);
drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c +9 -8
@@ -345,8 +345,9 @@ int smu_sys_get_pp_table(void *handle, char **table)return powerplay_table_size; } -int smu_sys_set_pp_table (struct smu_context *smu,void *buf,size_t size) +int smu_sys_set_pp_table (void *handle,const char *buf,size_t size) { +struct smu_context *smu = handle;struct smu_table_context *smu_table = &smu->smu_table;ATOM_COMMON_TABLE_HEADER *header = (ATOM_COMMON_TABLE_HEADER *)buf;int ret =0 ;
@@ -1648,8 +1649,9 @@ enum amd_dpm_forced_level smu_get_performance_level(void *handle)return level; } -int smu_force_performance_level (struct smu_context *smu,enum amd_dpm_forced_level level) +int smu_force_performance_level (void *handle,enum amd_dpm_forced_level level) { +struct smu_context *smu = handle;struct smu_dpm_context *smu_dpm_ctx = &(smu->smu_dpm);int ret =0 ;
@@ -2075,10 +2077,11 @@ int smu_print_ppclk_levels(void *handle, enum pp_clock_type type, char *buf)return smu_print_smuclk_levels (smu, clk_type, buf); } -int smu_od_edit_dpm_table (struct smu_context *smu, +int smu_od_edit_dpm_table (void *handle,enum PP_OD_DPM_TABLE_COMMAND type,long *input,uint32_t size) { +struct smu_context *smu = handle;int ret =0 ;if (!smu->pm_enabled || !smu->adev->pm.dpm_enabled)
@@ -2088,11 +2091,6 @@ int smu_od_edit_dpm_table(struct smu_context *smu,if (smu->ppt_funcs->od_edit_dpm_table) { ret = smu->ppt_funcs->od_edit_dpm_table (smu, type, input, size); -if (!ret && (type ==PP_OD_COMMIT_DPM_TABLE )) - ret =smu_handle_task (smu, - smu->smu_dpm.dpm_level, -AMD_PP_TASK_READJUST_POWER_STATE , - false); }mutex_unlock (&smu->mutex);
@@ -2731,6 +2729,7 @@ static const struct amd_pm_funcs swsmu_dpm_funcs = { .get_fan_control_mode = smu_get_fan_control_mode, .set_fan_speed_percent = smu_set_fan_speed_percent, .get_fan_speed_percent = smu_get_fan_speed_percent, + .force_performance_level = smu_force_performance_level, .read_sensor = smu_read_sensor, .get_performance_level = smu_get_performance_level, .get_current_power_state = smu_get_current_power_state,
@@ -2738,12 +2737,14 @@ static const struct amd_pm_funcs swsmu_dpm_funcs = { .set_fan_speed_rpm = smu_set_fan_speed_rpm, .get_pp_num_states = smu_get_power_num_states, .get_pp_table = smu_sys_get_pp_table, + .set_pp_table = smu_sys_set_pp_table, .switch_power_profile = smu_switch_power_profile,/* export to amdgpu */ .dispatch_tasks = smu_handle_dpm_task, .set_powergating_by_smu = smu_dpm_set_power_gate, .set_power_limit = smu_set_power_limit, .get_power_limit = smu_get_power_limit, + .odn_edit_dpm_table = smu_od_edit_dpm_table, .set_mp1_state = smu_set_mp1_state,/* export to DC */ .get_sclk = smu_get_sclk,
Signature · 6 lines
2.25.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 6/8 amdgpu/pm: Powerplay API for smu , changes to clock and profile mode functions
In reply to Darren PowellNew Functions
smu_bump_power_profile_mode() - changes profile mode assuming calling function already has mutex
smu_force_ppclk_levels() - accepts Powerplay enum pp_clock_type to specify clock to change smu_print_ppclk_levels() - accepts Powerplay enum pp_clock_type to request clock levels amdgpu_get_pp_dpm_clock() - accepts Powerplay enum pp_clock_type to request clock levels and allows
all the amdgpu_get_pp_dpm_$CLK functions to have a single codepath
amdgpu_set_pp_dpm_clock() - accepts Powerplay enum pp_clock_type to set clock levels and allows
all the amdgpu_set_pp_dpm_$CLK functions to have a single codepath
Modified Functions
smu_force_smuclk_levels - changed function name to make clear difference to smu_force_ppclk_levels
smu_force_ppclk_levels() - modifed signature to implement Powerplay API force_clock_level
- calls smu_force_smuclk_levels
smu_print_smuclk_levels - changed function name to make clear difference to smu_print_ppclk_levels
smu_print_ppclk_levels() - modifed signature to implement Powerplay API force_clock_level
- calls smu_print_smuclk_levels
smu_sys_get_gpu_metrics - modifed arg0 to match Powerplay API get_gpu_metrics
smu_get_power_profile_mode - modifed arg0 to match Powerplay API get_power_profile_mode
smu_set_power_profile_mode - modifed arg0 to match Powerplay API set_power_profile_mode
- removed arg lock_needed, mutex always locked, internal functions
can call smu_bump if they already hold lock
smu_switch_power_profile - now calls smu_bump as already holds mutex lock
smu_adjust_power_state_dynamic - now calls smu_bump as already holds mutex lock
amdgpu_get_pp_od_clk_voltage - uses smu_print_ppclk_levels
amdgpu_{set,get}_pp_dpm_$CLK - replace logic with call helper function amdgpu_{set,get}_pp_dpm_clock()
CLK ={sclk, mclk, socclk, fclk, dcefclk, pci}Other Changes
added 5 smu Powerplay functions to swsmu_dpm_funcs
removed special smu handling in pm functions and called through Powerplay API
--- drivers/gpu/drm/amd/pm/amdgpu_pm.c | 348 +++------------------- drivers/gpu/drm/amd/pm/inc/amdgpu_smu.h | 15 +- drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c | 93 ++++-- 3 files changed, 122 insertions(+), 334 deletions(-)
drivers/gpu/drm/amd/pm/amdgpu_pm.c +41 -307
@@ -879,10 +879,10 @@ static ssize_t amdgpu_get_pp_od_clk_voltage(struct device *dev, }if (is_support_sw_smu (adev)) { - size =smu_print_clk_levels (&adev->smu,SMU_OD_SCLK , buf); - size +=smu_print_clk_levels (&adev->smu,SMU_OD_MCLK , buf+size); - size +=smu_print_clk_levels (&adev->smu,SMU_OD_VDDC_CURVE , buf+size); - size +=smu_print_clk_levels (&adev->smu,SMU_OD_RANGE , buf+size); + size =smu_print_ppclk_levels (&adev->smu,OD_SCLK , buf); + size +=smu_print_ppclk_levels (&adev->smu,OD_MCLK , buf+size); + size +=smu_print_ppclk_levels (&adev->smu,OD_VDDC_CURVE , buf+size); + size +=smu_print_ppclk_levels (&adev->smu,OD_RANGE , buf+size); }else if (adev->powerplay.pp_funcs->print_clock_levels) { size =amdgpu_dpm_print_clock_levels (adev,OD_SCLK , buf); size +=amdgpu_dpm_print_clock_levels (adev,OD_MCLK , buf+size);
@@ -1016,8 +1016,8 @@ static ssize_t amdgpu_get_pp_features(struct device *dev,* NOTE: change to the dcefclk max dpm level is not supported now */ -static ssize_t amdgpu_get_pp_dpm_sclk (struct device *dev, -struct device_attribute *attr, +static ssize_t amdgpu_get_pp_dpm_clock (struct device *dev, +enum pp_clock_type type,char *buf) {struct drm_device *ddev =dev_get_drvdata (dev);
@@ -1034,10 +1034,8 @@ static ssize_t amdgpu_get_pp_dpm_sclk(struct device *dev,return ret; } -if (is_support_sw_smu (adev)) - size =smu_print_clk_levels (&adev->smu,SMU_SCLK , buf); -else if (adev->powerplay.pp_funcs->print_clock_levels) - size =amdgpu_dpm_print_clock_levels (adev,PP_SCLK , buf); +if (adev->powerplay.pp_funcs->print_clock_levels) + size =amdgpu_dpm_print_clock_levels (adev, type, buf);else size =snprintf (buf,PAGE_SIZE ,"\n" );
@@ -1083,8 +1081,8 @@ static ssize_t amdgpu_read_mask(const char *buf, size_t count, uint32_t *mask)return 0 ; } -static ssize_t amdgpu_set_pp_dpm_sclk (struct device *dev, -struct device_attribute *attr, +static ssize_t amdgpu_set_pp_dpm_clock (struct device *dev, +enum pp_clock_type type,const char *buf,size_t count) {
@@ -1106,10 +1104,10 @@ static ssize_t amdgpu_set_pp_dpm_sclk(struct device *dev,return ret; } -if (is_support_sw_smu (adev)) - ret =smu_force_clk_levels (&adev->smu,SMU_SCLK , mask); -else if (adev->powerplay.pp_funcs->force_clock_level) - ret =amdgpu_dpm_force_clock_level (adev,PP_SCLK , mask); +if (adev->powerplay.pp_funcs->force_clock_level) + ret =amdgpu_dpm_force_clock_level (adev, type, mask); +else + ret =0 ;pm_runtime_mark_last_busy (ddev->dev);pm_runtime_put_autosuspend (ddev->dev);
@@ -1120,35 +1118,26 @@ static ssize_t amdgpu_set_pp_dpm_sclk(struct device *dev,return count; } -static ssize_t amdgpu_get_pp_dpm_mclk (struct device *dev, +static ssize_t amdgpu_get_pp_dpm_sclk (struct device *dev,struct device_attribute *attr,char *buf) { -struct drm_device *ddev =dev_get_drvdata (dev); -struct amdgpu_device *adev =drm_to_adev (ddev); -ssize_t size; -int ret; - -if (amdgpu_in_reset (adev)) -return -EPERM ; - - ret =pm_runtime_get_sync (ddev->dev); -if (ret <0 ) { -pm_runtime_put_autosuspend (ddev->dev); -return ret; - } - -if (is_support_sw_smu (adev)) - size =smu_print_clk_levels (&adev->smu,SMU_MCLK , buf); -else if (adev->powerplay.pp_funcs->print_clock_levels) - size =amdgpu_dpm_print_clock_levels (adev,PP_MCLK , buf); -else - size =snprintf (buf,PAGE_SIZE ,"\n" ); +return amdgpu_get_pp_dpm_clock (dev,PP_SCLK , buf); +} -pm_runtime_mark_last_busy (ddev->dev); -pm_runtime_put_autosuspend (ddev->dev); +static ssize_t amdgpu_set_pp_dpm_sclk (struct device *dev, +struct device_attribute *attr, +const char *buf, +size_t count) +{ +return amdgpu_set_pp_dpm_clock (dev,PP_SCLK , buf, count); +} -return size; +static ssize_t amdgpu_get_pp_dpm_mclk (struct device *dev, +struct device_attribute *attr, +char *buf) +{ +return amdgpu_get_pp_dpm_clock (dev,PP_MCLK , buf); } static ssize_t amdgpu_set_pp_dpm_mclk(struct device *dev,
@@ -1156,67 +1145,14 @@ static ssize_t amdgpu_set_pp_dpm_mclk(struct device *dev,const char *buf, size_t count) { -struct drm_device *ddev =dev_get_drvdata (dev); -struct amdgpu_device *adev =drm_to_adev (ddev); -uint32_t mask =0 ; -int ret; - -if (amdgpu_in_reset (adev)) -return -EPERM ; - - ret =amdgpu_read_mask (buf, count, &mask); -if (ret) -return ret; - - ret =pm_runtime_get_sync (ddev->dev); -if (ret <0 ) { -pm_runtime_put_autosuspend (ddev->dev); -return ret; - } - -if (is_support_sw_smu (adev)) - ret =smu_force_clk_levels (&adev->smu,SMU_MCLK , mask); -else if (adev->powerplay.pp_funcs->force_clock_level) - ret =amdgpu_dpm_force_clock_level (adev,PP_MCLK , mask); - -pm_runtime_mark_last_busy (ddev->dev); -pm_runtime_put_autosuspend (ddev->dev); - -if (ret) -return -EINVAL ; - -return count; + return amdgpu_set_pp_dpm_clock(dev, PP_MCLK, buf, count); }static ssize_t amdgpu_get_pp_dpm_socclk (struct device *dev,struct device_attribute *attr,char *buf) { -struct drm_device *ddev =dev_get_drvdata (dev); -struct amdgpu_device *adev =drm_to_adev (ddev); -ssize_t size; -int ret; - -if (amdgpu_in_reset (adev)) -return -EPERM ; - - ret =pm_runtime_get_sync (ddev->dev); -if (ret <0 ) { -pm_runtime_put_autosuspend (ddev->dev); -return ret; - } - -if (is_support_sw_smu (adev)) - size =smu_print_clk_levels (&adev->smu,SMU_SOCCLK , buf); -else if (adev->powerplay.pp_funcs->print_clock_levels) - size =amdgpu_dpm_print_clock_levels (adev,PP_SOCCLK , buf); -else - size =snprintf (buf,PAGE_SIZE ,"\n" ); - -pm_runtime_mark_last_busy (ddev->dev); -pm_runtime_put_autosuspend (ddev->dev); - -return size; +return amdgpu_get_pp_dpm_clock (dev,PP_SOCCLK , buf); } static ssize_t amdgpu_set_pp_dpm_socclk(struct device *dev,
@@ -1224,69 +1160,14 @@ static ssize_t amdgpu_set_pp_dpm_socclk(struct device *dev,const char *buf, size_t count) { -struct drm_device *ddev =dev_get_drvdata (dev); -struct amdgpu_device *adev =drm_to_adev (ddev); -int ret; -uint32_t mask =0 ; - -if (amdgpu_in_reset (adev)) -return -EPERM ; - - ret =amdgpu_read_mask (buf, count, &mask); -if (ret) -return ret; - - ret =pm_runtime_get_sync (ddev->dev); -if (ret <0 ) { -pm_runtime_put_autosuspend (ddev->dev); -return ret; - } - -if (is_support_sw_smu (adev)) - ret =smu_force_clk_levels (&adev->smu,SMU_SOCCLK , mask); -else if (adev->powerplay.pp_funcs->force_clock_level) - ret =amdgpu_dpm_force_clock_level (adev,PP_SOCCLK , mask); -else - ret =0 ; - -pm_runtime_mark_last_busy (ddev->dev); -pm_runtime_put_autosuspend (ddev->dev); - -if (ret) -return -EINVAL ; - -return count; + return amdgpu_set_pp_dpm_clock(dev, PP_SOCCLK, buf, count); }static ssize_t amdgpu_get_pp_dpm_fclk (struct device *dev,struct device_attribute *attr,char *buf) { -struct drm_device *ddev =dev_get_drvdata (dev); -struct amdgpu_device *adev =drm_to_adev (ddev); -ssize_t size; -int ret; - -if (amdgpu_in_reset (adev)) -return -EPERM ; - - ret =pm_runtime_get_sync (ddev->dev); -if (ret <0 ) { -pm_runtime_put_autosuspend (ddev->dev); -return ret; - } - -if (is_support_sw_smu (adev)) - size =smu_print_clk_levels (&adev->smu,SMU_FCLK , buf); -else if (adev->powerplay.pp_funcs->print_clock_levels) - size =amdgpu_dpm_print_clock_levels (adev,PP_FCLK , buf); -else - size =snprintf (buf,PAGE_SIZE ,"\n" ); - -pm_runtime_mark_last_busy (ddev->dev); -pm_runtime_put_autosuspend (ddev->dev); - -return size; +return amdgpu_get_pp_dpm_clock (dev,PP_FCLK , buf); } static ssize_t amdgpu_set_pp_dpm_fclk(struct device *dev,
@@ -1294,69 +1175,14 @@ static ssize_t amdgpu_set_pp_dpm_fclk(struct device *dev,const char *buf, size_t count) { -struct drm_device *ddev =dev_get_drvdata (dev); -struct amdgpu_device *adev =drm_to_adev (ddev); -int ret; -uint32_t mask =0 ; - -if (amdgpu_in_reset (adev)) -return -EPERM ; - - ret =amdgpu_read_mask (buf, count, &mask); -if (ret) -return ret; - - ret =pm_runtime_get_sync (ddev->dev); -if (ret <0 ) { -pm_runtime_put_autosuspend (ddev->dev); -return ret; - } - -if (is_support_sw_smu (adev)) - ret =smu_force_clk_levels (&adev->smu,SMU_FCLK , mask); -else if (adev->powerplay.pp_funcs->force_clock_level) - ret =amdgpu_dpm_force_clock_level (adev,PP_FCLK , mask); -else - ret =0 ; - -pm_runtime_mark_last_busy (ddev->dev); -pm_runtime_put_autosuspend (ddev->dev); - -if (ret) -return -EINVAL ; - -return count; + return amdgpu_set_pp_dpm_clock(dev, PP_FCLK, buf, count); }static ssize_t amdgpu_get_pp_dpm_dcefclk (struct device *dev,struct device_attribute *attr,char *buf) { -struct drm_device *ddev =dev_get_drvdata (dev); -struct amdgpu_device *adev =drm_to_adev (ddev); -ssize_t size; -int ret; - -if (amdgpu_in_reset (adev)) -return -EPERM ; - - ret =pm_runtime_get_sync (ddev->dev); -if (ret <0 ) { -pm_runtime_put_autosuspend (ddev->dev); -return ret; - } - -if (is_support_sw_smu (adev)) - size =smu_print_clk_levels (&adev->smu,SMU_DCEFCLK , buf); -else if (adev->powerplay.pp_funcs->print_clock_levels) - size =amdgpu_dpm_print_clock_levels (adev,PP_DCEFCLK , buf); -else - size =snprintf (buf,PAGE_SIZE ,"\n" ); - -pm_runtime_mark_last_busy (ddev->dev); -pm_runtime_put_autosuspend (ddev->dev); - -return size; +return amdgpu_get_pp_dpm_clock (dev,PP_DCEFCLK , buf); } static ssize_t amdgpu_set_pp_dpm_dcefclk(struct device *dev,
@@ -1364,69 +1190,14 @@ static ssize_t amdgpu_set_pp_dpm_dcefclk(struct device *dev,const char *buf, size_t count) { -struct drm_device *ddev =dev_get_drvdata (dev); -struct amdgpu_device *adev =drm_to_adev (ddev); -int ret; -uint32_t mask =0 ; - -if (amdgpu_in_reset (adev)) -return -EPERM ; - - ret =amdgpu_read_mask (buf, count, &mask); -if (ret) -return ret; - - ret =pm_runtime_get_sync (ddev->dev); -if (ret <0 ) { -pm_runtime_put_autosuspend (ddev->dev); -return ret; - } - -if (is_support_sw_smu (adev)) - ret =smu_force_clk_levels (&adev->smu,SMU_DCEFCLK , mask); -else if (adev->powerplay.pp_funcs->force_clock_level) - ret =amdgpu_dpm_force_clock_level (adev,PP_DCEFCLK , mask); -else - ret =0 ; - -pm_runtime_mark_last_busy (ddev->dev); -pm_runtime_put_autosuspend (ddev->dev); - -if (ret) -return -EINVAL ; - -return count; + return amdgpu_set_pp_dpm_clock(dev, PP_DCEFCLK, buf, count); }static ssize_t amdgpu_get_pp_dpm_pcie (struct device *dev,struct device_attribute *attr,char *buf) { -struct drm_device *ddev =dev_get_drvdata (dev); -struct amdgpu_device *adev =drm_to_adev (ddev); -ssize_t size; -int ret; - -if (amdgpu_in_reset (adev)) -return -EPERM ; - - ret =pm_runtime_get_sync (ddev->dev); -if (ret <0 ) { -pm_runtime_put_autosuspend (ddev->dev); -return ret; - } - -if (is_support_sw_smu (adev)) - size =smu_print_clk_levels (&adev->smu,SMU_PCIE , buf); -else if (adev->powerplay.pp_funcs->print_clock_levels) - size =amdgpu_dpm_print_clock_levels (adev,PP_PCIE , buf); -else - size =snprintf (buf,PAGE_SIZE ,"\n" ); - -pm_runtime_mark_last_busy (ddev->dev); -pm_runtime_put_autosuspend (ddev->dev); - -return size; +return amdgpu_get_pp_dpm_clock (dev,PP_PCIE , buf); } static ssize_t amdgpu_set_pp_dpm_pcie(struct device *dev,
@@ -1434,38 +1205,7 @@ static ssize_t amdgpu_set_pp_dpm_pcie(struct device *dev,const char *buf, size_t count) { -struct drm_device *ddev =dev_get_drvdata (dev); -struct amdgpu_device *adev =drm_to_adev (ddev); -int ret; -uint32_t mask =0 ; - -if (amdgpu_in_reset (adev)) -return -EPERM ; - - ret =amdgpu_read_mask (buf, count, &mask); -if (ret) -return ret; - - ret =pm_runtime_get_sync (ddev->dev); -if (ret <0 ) { -pm_runtime_put_autosuspend (ddev->dev); -return ret; - } - -if (is_support_sw_smu (adev)) - ret =smu_force_clk_levels (&adev->smu,SMU_PCIE , mask); -else if (adev->powerplay.pp_funcs->force_clock_level) - ret =amdgpu_dpm_force_clock_level (adev,PP_PCIE , mask); -else - ret =0 ; - -pm_runtime_mark_last_busy (ddev->dev); -pm_runtime_put_autosuspend (ddev->dev); - -if (ret) -return -EINVAL ; - -return count; + return amdgpu_set_pp_dpm_clock(dev, PP_PCIE, buf, count); } static ssize_t amdgpu_get_pp_sclk_od(struct device *dev,
@@ -1652,9 +1392,7 @@ static ssize_t amdgpu_get_pp_power_profile_mode(struct device *dev,return ret; } -if (is_support_sw_smu (adev)) - size =smu_get_power_profile_mode (&adev->smu, buf); -else if (adev->powerplay.pp_funcs->get_power_profile_mode) +if (adev->powerplay.pp_funcs->get_power_profile_mode) size =amdgpu_dpm_get_power_profile_mode (adev, buf);else size =snprintf (buf,PAGE_SIZE ,"\n" );
@@ -1717,9 +1455,7 @@ static ssize_t amdgpu_set_pp_power_profile_mode(struct device *dev,return ret; } -if (is_support_sw_smu (adev)) - ret =smu_set_power_profile_mode (&adev->smu, parameter, parameter_size, true); -else if (adev->powerplay.pp_funcs->set_power_profile_mode) +if (adev->powerplay.pp_funcs->set_power_profile_mode) ret =amdgpu_dpm_set_power_profile_mode (adev, parameter, parameter_size);pm_runtime_mark_last_busy (ddev->dev);
@@ -1976,9 +1712,7 @@ static ssize_t amdgpu_get_gpu_metrics(struct device *dev,return ret; } -if (is_support_sw_smu (adev)) - size =smu_sys_get_gpu_metrics (&adev->smu, &gpu_metrics); -else if (adev->powerplay.pp_funcs->get_gpu_metrics) +if (adev->powerplay.pp_funcs->get_gpu_metrics) size =amdgpu_dpm_get_gpu_metrics (adev, &gpu_metrics);if (size <=0 )
drivers/gpu/drm/amd/pm/inc/amdgpu_smu.h +5 -10
@@ -662,19 +662,16 @@ int smu_set_fan_speed_rpm(void *handle, uint32_t speed);int smu_get_power_limit (void *handle,uint32_t *limit,bool max_setting);int smu_set_power_limit (void *handle,uint32_t limit); -int smu_print_clk_levels (struct smu_context *smu,enum smu_clk_type clk_type,char *buf); +int smu_print_ppclk_levels (void *handle,enum pp_clock_type type,char *buf);int smu_od_edit_dpm_table (struct smu_context *smu,enum PP_OD_DPM_TABLE_COMMAND type,long *input,uint32_t size);int smu_read_sensor (void *handle,int sensor,void *data,int *size); -int smu_get_power_profile_mode (struct smu_context *smu,char *buf); +int smu_get_power_profile_mode (void *handle,char *buf); -int smu_set_power_profile_mode (struct smu_context *smu, -long *param, -uint32_t param_size, -bool lock_needed); +int smu_set_power_profile_mode (void *handle,long *param,uint32_t param_size);u32 smu_get_fan_control_mode (void *handle);void smu_set_fan_control_mode (void *handle,u32 value);int smu_get_fan_speed_percent (void *handle,u32 *speed);
@@ -748,9 +745,7 @@ int smu_set_display_count(struct smu_context *smu, uint32_t count);int smu_set_ac_dc (struct smu_context *smu);int smu_sys_get_pp_feature_mask (void *handle,char *buf);int smu_sys_set_pp_feature_mask (void *handle,uint64_t new_mask); -int smu_force_clk_levels (struct smu_context *smu, -enum smu_clk_type clk_type, -uint32_t mask); +int smu_force_ppclk_levels (void *handle,enum pp_clock_type type,uint32_t mask);int smu_set_mp1_state (void *handle,enum pp_mp1_state mp1_state); int smu_set_df_cstate(void *handle,
@@ -769,7 +764,7 @@ int smu_get_dpm_clock_table(struct smu_context *smu,int smu_get_status_gfxoff (struct amdgpu_device *adev,uint32_t *value); -ssize_t smu_sys_get_gpu_metrics (struct smu_context *smu,void **table); +ssize_t smu_sys_get_gpu_metrics (void *handle,void **table);int smu_enable_mgpu_fan_boost (void *handle);int smu_gfx_state_change_set (struct smu_context *smu,uint32_t state);
drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c +76 -17
168 lines not on this page · raw message
Signature · 6 lines
2.25.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
[AMD Official Use Only - Internal Distribution Only]
Thanks for these cleaups. The series is acked-by: Evan Quan <[email protected]>
-----Original Message-----
From: amd-gfx <[email protected]> On Behalf Of Darren Powell
Sent: Saturday, December 19, 2020 8:48 AM
To: [email protected]
Cc: Powell, Darren <[email protected]>
Subject: [PATCH 0/8] amdgpu/pm: Powerplay API for smu
=== Description ===
Patches to add the Powerplay API to smu and simplify dpm/pm calling code
=== Test System ===
* DESKTOP(AMD FX-8350 + NAVI10(731F/ca), BIOS: F2) + ISO(Ubuntu 20.04.1 LTS) + Kernel(5.9.0-rc5-custom-pmcallback-00865-gd3b9ec1a13c9)
=== Patch Summary ===
linux: (git://people.freedesktop.org/~agd5f/linux) origin/amd-staging-drm-next @ d3b9ec1a13c9
+ 05e1d87d1cb4 amdgpu/pm: Powerplay API for smu , added get_performance_level
+ b9e2be067f01 amdgpu/pm: Powerplay API for smu , changed 6 dpm reset functions to use API
+ 9add1d6485a4 amdgpu/pm: Powerplay API for smu , changed 6 pm hwmon fan functions to use API
+ c02b35074f14 amdgpu/pm: Powerplay API for smu , changed 9 pm power functions to use API
+ 483bd1207f2c amdgpu/pm: Powerplay API for smu , changed 5 dpm powergating & sensor functions to use API
+ f91c1665e30e amdgpu/pm: Powerplay API for smu , changes to clock and profile mode functions
+ d1400afa4785 amdgpu/pm: Powerplay API for smu , changed 4 dpm functions to use API
+ 2f12f7afa690 amdgpu/pm: Powerplay API for smu , updates to some pm functions
=== Tests ===
** 0001
amdgpu_get_power_dpm_force_performance_level() <- /sys/class/drm/card0/device/power_dpm_force_performance_level
** 0002
amdgpu_dpm_set_mp1_state <- systemctl suspend amdgpu_dpm_mode2_reset <- untested: needs Arctic Islands Hardware (VEGAx, RAVEN) amdgpu_dpm_switch_power_profile <- untested amdgpu_dpm_set_xgmi_pstate <- untested: amdgpu_xgmi_set_pstate():411 pstate switching disabled amdgpu_dpm_set_df_cstate <- untested: needs ras enabled hardware amdgpu_dpm_enable_mgpu_fan_boost <- untested: needs multi-gpu hardware ** 0003 amdgpu_hwmon_get_pwm1_enable <- /sys/class/drm/card0/device/hwmon/hwmon?/pwm1_enable amdgpu_hwmon_set_pwm1_enable <- /sys/class/drm/card0/device/hwmon/hwmon?/pwm1_enable amdgpu_hwmon_set_pwm1 <- /sys/class/drm/card0/device/hwmon/hwmon?/pwm1 amdgpu_hwmon_get_pwm1 <- /sys/class/drm/card0/device/hwmon/hwmon?/pwm1 amdgpu_hwmon_get_fan1_input <- /sys/class/drm/card0/device/hwmon/hwmon?/fan1_input amdgpu_hwmon_get_fan1_target <- /sys/class/drm/card0/device/hwmon/hwmon?/fan1_target amdgpu_hwmon_set_fan1_target <- /sys/class/drm/card0/device/hwmon/hwmon?/fan1_target amdgpu_hwmon_get_fan1_enable <- /sys/class/drm/card0/device/hwmon/hwmon?/fan1_enable amdgpu_hwmon_set_fan1_enable <- /sys/class/drm/card0/device/hwmon/hwmon?/fan1_enable ** 0004 amdgpu_get_power_dpm_state <- /sys/class/drm/card0/device/power_dpm_state amdgpu_set_power_dpm_force_performance_level <- /sys/class/drm/card0/device/power_dpm_force_performance_level amdgpu_get_pp_num_states <- /sys/class/drm/card0/device/pp_num_states amdgpu_get_pp_cur_state <- /sys/class/drm/card0/device/pp_cur_state amdgpu_get_pp_table <- /sys/class/drm/card0/device/pp_table amdgpu_get_pp_features <- /sys/class/drm/card0/device/pp_features amdgpu_hwmon_show_power_cap_max <- /sys/class/drm/card0/device/hwmon/hwmon?/power1_cap_max amdgpu_hwmon_show_power_cap <- /sys/class/drm/card0/device/hwmon/hwmon?/power1_cap amdgpu_hwmon_set_power_cap <- /sys/class/drm/card0/device/hwmon/hwmon?/power1_cap ** 0005 amdgpu_dpm_baco_enter <- untested: called from runtime.pm amdgpu_dpm_baco_exit <- untested: called from runtime.pm amdgpu_dpm_is_baco_supported <- untested: needs other Hardware(cik, vi, soc15) amdgpu_dpm_baco_reset <- untested: needs other Hardware(cik, vi, soc15) ** 0006 amdgpu_get_pp_dpm_sclk <- /sys/class/drm/card0/device/pp_dpm_sclk amdgpu_set_pp_dpm_sclk <- /sys/class/drm/card0/device/pp_dpm_sclk amdgpu_get_pp_dpm_mclk <- /sys/class/drm/card0/device/pp_dpm_mclk amdgpu_set_pp_dpm_mclk <- /sys/class/drm/card0/device/pp_dpm_mclk amdgpu_get_pp_dpm_socclk <- /sys/class/drm/card0/device/pp_dpm_socclk amdgpu_set_pp_dpm_socclk <- /sys/class/drm/card0/device/pp_dpm_socclk amdgpu_get_pp_dpm_fclk <- /sys/class/drm/card0/device/pp_dpm_fclk amdgpu_set_pp_dpm_fclk <- /sys/class/drm/card0/device/pp_dpm_fclk amdgpu_get_pp_dpm_dcefclk <- /sys/class/drm/card0/device/pp_dpm_dcefclk amdgpu_set_pp_dpm_dcefclk <- /sys/class/drm/card0/device/pp_dpm_dcefclk amdgpu_get_pp_dpm_pcie <- /sys/class/drm/card0/device/pp_dpm_pcie amdgpu_set_pp_dpm_pcie <- /sys/class/drm/card0/device/pp_dpm_pcie amdgpu_get_pp_power_profile_mode <- /sys/class/drm/card0/device/pp_power_profile_mode amdgpu_set_pp_power_profile_mode <- /sys/class/drm/card0/device/pp_power_profile_mode amdgpu_get_gpu_metrics <- /sys/class/drm/card0/device/gpu_metrics ** 0007 amdgpu_pm_compute_clocks <- untested amdgpu_dpm_set_powergating_by_smu <- untested amdgpu_dpm_get_mclk <- untested amdgpu_dpm_get_sclk <- untested ** 0008 amdgpu_get_pp_od_clk_voltage <- /sys/class/drm/card0/device/pp_od_clk_voltage amdgpu_set_pp_od_clk_voltage <- /sys/class/drm/card0/device/pp_od_clk_voltage amdgpu_set_pp_table <- /sys/class/drm/card0/device/pp_table
amdgpu_set_power_dpm_force_performance_level <- /sys/class/drm/card0/device/power_dpm_force_performance_level
=== Summary of Untested Functions ===
** 0002
amdgpu_dpm_mode2_reset <- untested: needs Arctic Islands Hardware (VEGAx, RAVEN) amdgpu_dpm_switch_power_profile <- untested: called during initialization amdgpu_dpm_set_xgmi_pstate <- untested: amdgpu_xgmi_set_pstate():411 pstate switching disabled amdgpu_dpm_set_df_cstate <- untested: needs ras enabled hardware amdgpu_dpm_enable_mgpu_fan_boost <- untested: needs multi-gpu hardware ** 0005 amdgpu_dpm_baco_enter <- untested: called from runtime.pm amdgpu_dpm_baco_exit <- untested: called from runtime.pm amdgpu_dpm_is_baco_supported <- untested: needs other Hardware(cik, vi, soc15) amdgpu_dpm_baco_reset <- untested: needs other Hardware(cik, vi, soc15) ** 0007 amdgpu_pm_compute_clocks <- untested amdgpu_dpm_set_powergating_by_smu <- untested amdgpu_dpm_get_mclk <- untested amdgpu_dpm_get_sclk <- untested ** 0008 amdgpu_get_pp_od_clk_voltage <- file not found amdgpu_set_pp_od_clk_voltage <- file not found amdgpu_set_pp_table <- no binary data to test with
=== Cover Letter ===
Darren Powell (8):
amdgpu/pm: Powerplay API for smu , added get_performance_level amdgpu/pm: Powerplay API for smu , changed 6 dpm reset functions to
use API
amdgpu/pm: Powerplay API for smu , changed 6 pm hwmon fan functions to
use API
amdgpu/pm: Powerplay API for smu , changed 9 pm power functions to use
API
amdgpu/pm: Powerplay API for smu , changed 5 dpm powergating & sensor
functions to use API
amdgpu/pm: Powerplay API for smu , changes to clock and profile mode
functions
amdgpu/pm: Powerplay API for smu , changed 4 dpm functions to use API amdgpu/pm: Powerplay API for smu , updates to some pm functions
drivers/gpu/drm/amd/pm/amdgpu_dpm.c | 226 +++----- drivers/gpu/drm/amd/pm/amdgpu_pm.c | 596 +++++----------------- drivers/gpu/drm/amd/pm/inc/amdgpu_smu.h | 79 ++- drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c | 334 +++++++++--- 4 files changed, 511 insertions(+), 724 deletions(-)
--
2.25.1
_______________________________________________
amd-gfx mailing list
[email protected]
https://nam11.safelinks.protection.outlook.com/?url=https%3A%2F%2Flists.freedesktop.org%2Fmailman%2Flistinfo%2Famd-gfx&data=04%7C01%7Cevan.quan%40amd.com%7C35efd75734c84eae04bf08d8a3b7df1a%7C3dd8961fe4884e608e11a82d994e183d%7C0%7C0%7C637439357421991565%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C1000&sdata=cvVKTf%2FK%2FNuC2SE7H%2F88DRRfWmxVFqETJ%2BlROM6JSGs%3D&reserved=0
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
Re: [PATCH 1/8] amdgpu/pm: Powerplay API for smu , added get_performance_level
In reply to Darren Powell[AMD Official Use Only - Internal Distribution Only]
________________________________
From: amd-gfx <[email protected]> on behalf of Darren Powell <[email protected]>
Sent: Saturday, December 19, 2020 8:48 AM
To: [email protected] <[email protected]>
Cc: Powell, Darren <[email protected]>
Subject: [PATCH 1/8] amdgpu/pm: Powerplay API for smu , added get_performance_level
Modified Functions
smu_get_performance_level() - modifed arg0 to match Powerplay API get_performance_level
Other Changes
added a new structure swsmu_dpm_funcs to hold smu functions for Powerplay API removed special smu handling from amdgpu_get_power_dpm_force_performance_level
--- drivers/gpu/drm/amd/pm/amdgpu_pm.c | 4 +--- drivers/gpu/drm/amd/pm/inc/amdgpu_smu.h | 2 +- drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c | 12 +++++++++++- 3 files changed, 13 insertions(+), 5 deletions(-)
drivers/gpu/drm/amd/pm/amdgpu_pm.c +1 -3
@@ -280,9 +280,7 @@ static ssize_t amdgpu_get_power_dpm_force_performance_level(struct device *dev,return ret; } -if (is_support_sw_smu (adev)) - level =smu_get_performance_level (&adev->smu); -else if (adev->powerplay.pp_funcs->get_performance_level) +if (adev->powerplay.pp_funcs->get_performance_level) level =amdgpu_dpm_get_performance_level (adev);else level = adev->pm.dpm.forced_level;
drivers/gpu/drm/amd/pm/inc/amdgpu_smu.h +1 -1
@@ -743,7 +743,7 @@ int smu_get_dpm_freq_range(struct smu_context *smu, enum smu_clk_type clk_type, uint32_t *min, uint32_t *max);int smu_set_soft_freq_range (struct smu_context *smu,enum smu_clk_type clk_type,uint32_t min,uint32_t max); -enum amd_dpm_forced_level smu_get_performance_level (struct smu_context *smu); +enum amd_dpm_forced_level smu_get_performance_level (void *handle);int smu_force_performance_level (struct smu_context *smu,enum amd_dpm_forced_level level);int smu_set_display_count (struct smu_context *smu,uint32_t count);int smu_set_ac_dc (struct smu_context *smu);
drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c +11 -1
@@ -46,6 +46,8 @@#undef pr_info#undef pr_debug +static const struct amd_pm_funcs swsmu_dpm_funcs; +size_t smu_sys_get_pp_feature_mask (struct smu_context *smu,char *buf) {size_t size =0 ;
@@ -428,6 +430,9 @@ static int smu_early_init(void *handle) smu->smu_baco.state =SMU_BACO_STATE_EXIT ; smu->smu_baco.platform_support = false; + adev->powerplay.pp_handle = smu; + adev->powerplay.pp_funcs = &swsmu_dpm_funcs; +return smu_set_funcs (adev); }
@@ -1569,8 +1574,9 @@ int smu_switch_power_profile(struct smu_context *smu,return 0 ; } -enum amd_dpm_forced_level smu_get_performance_level (struct smu_context *smu) +enum amd_dpm_forced_level smu_get_performance_level (void *handle) { +struct smu_context *smu = handle;struct smu_dpm_context *smu_dpm_ctx = &(smu->smu_dpm);enum amd_dpm_forced_level level;
@@ -2549,3 +2555,7 @@ int smu_gfx_state_change_set(struct smu_context *smu, uint32_t state)return ret; } + +static const struct amd_pm_funcs swsmu_dpm_funcs = { + .get_performance_level = smu_get_performance_level, +};
[kevin]:
could you change this name to "smu_pm_funcs" or others,
not of all fields is DPM related functions in data structure of 'amd_pm_funcs' it will make some confused for developers.
--
2.25.1
_______________________________________________
amd-gfx mailing list
[email protected]
https://nam11.safelinks.protection.outlook.com/?url=https%3A%2F%2Flists.freedesktop.org%2Fmailman%2Flistinfo%2Famd-gfx&data=04%7C01%7CKevin1.Wang%40amd.com%7Ce82fe9048c4d43857c9908d8a3b7e561%7C3dd8961fe4884e608e11a82d994e183d%7C0%7C0%7C637439357533667974%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C1000&sdata=vGF8e0xTEWyAqKusXbH23Ez4k5Lzz6RmORQXN6unJz8%3D&reserved=0
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
Re: [PATCH 3/8] amdgpu/pm: Powerplay API for smu , changed 6 pm hwmon fan functions to use API
In reply to Darren Powell[AMD Official Use Only - Internal Distribution Only]
________________________________
From: amd-gfx <[email protected]> on behalf of Darren Powell <[email protected]>
Sent: Saturday, December 19, 2020 8:48 AM
To: [email protected] <[email protected]>
Cc: Powell, Darren <[email protected]>
Subject: [PATCH 3/8] amdgpu/pm: Powerplay API for smu , changed 6 pm hwmon fan functions to use API
Modified Functions
smu_set_fan_speed_rpm() - modifed arg0 to match Powerplay API set_fan_speed_rpm smu_get_fan_control_mode() - modifed signature to match Powerplay API get_fan_control_mode smu_set_fan_control_mode() - modifed signature to match Powerplay API set_fan_control_mode
smu_get_fan_speed_percent() - modifed signature to match Powerplay API get_fan_speed_percent smu_set_fan_speed_percent() - modifed signature to match Powerplay API set_fan_speed_percent
smu_get_fan_speed_rpm() - modifed arg0 to match Powerplay API get_fan_speed_rpm
Other Changes
added 6 above smu fan Powerplay functions to swsmu_dpm_funcs removed special smu handling of above functions and called through Powerplay API
--- drivers/gpu/drm/amd/pm/amdgpu_pm.c | 87 +++++++---------------- drivers/gpu/drm/amd/pm/inc/amdgpu_smu.h | 12 ++-- drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c | 33 ++++++--- 3 files changed, 55 insertions(+), 77 deletions(-)
drivers/gpu/drm/amd/pm/amdgpu_pm.c +27 -60
@@ -2349,18 +2349,14 @@ static ssize_t amdgpu_hwmon_get_pwm1_enable(struct device *dev,return ret; } -if (is_support_sw_smu (adev)) { - pwm_mode =smu_get_fan_control_mode (&adev->smu); - }else { -if (!adev->powerplay.pp_funcs->get_fan_control_mode) { +if (!adev->powerplay.pp_funcs->get_fan_control_mode) {pm_runtime_mark_last_busy (adev_to_drm (adev)->dev);pm_runtime_put_autosuspend (adev_to_drm (adev)->dev);return -EINVAL ; - } - - pwm_mode =amdgpu_dpm_get_fan_control_mode (adev); } + pwm_mode =amdgpu_dpm_get_fan_control_mode (adev); +pm_runtime_mark_last_busy (adev_to_drm (adev)->dev);pm_runtime_put_autosuspend (adev_to_drm (adev)->dev);
@@ -2389,18 +2385,14 @@ static ssize_t amdgpu_hwmon_set_pwm1_enable(struct device *dev,return ret; } -if (is_support_sw_smu (adev)) { -smu_set_fan_control_mode (&adev->smu, value); - }else { -if (!adev->powerplay.pp_funcs->set_fan_control_mode) { -pm_runtime_mark_last_busy (adev_to_drm (adev)->dev); -pm_runtime_put_autosuspend (adev_to_drm (adev)->dev); -return -EINVAL ; - } - -amdgpu_dpm_set_fan_control_mode (adev, value); +if (!adev->powerplay.pp_funcs->set_fan_control_mode) { +pm_runtime_mark_last_busy (adev_to_drm (adev)->dev); +pm_runtime_put_autosuspend (adev_to_drm (adev)->dev); +return -EINVAL ; } +amdgpu_dpm_set_fan_control_mode (adev, value); +pm_runtime_mark_last_busy (adev_to_drm (adev)->dev);pm_runtime_put_autosuspend (adev_to_drm (adev)->dev);
@@ -2439,11 +2431,7 @@ static ssize_t amdgpu_hwmon_set_pwm1(struct device *dev,return err; } -if (is_support_sw_smu (adev)) - pwm_mode =smu_get_fan_control_mode (&adev->smu); -else - pwm_mode =amdgpu_dpm_get_fan_control_mode (adev); - + pwm_mode =amdgpu_dpm_get_fan_control_mode (adev);if (pwm_mode !=AMD_FAN_CTRL_MANUAL ) {pr_info ("manual fan speed control should be enabled first\n" );pm_runtime_mark_last_busy (adev_to_drm (adev)->dev);
@@ -2460,9 +2448,7 @@ static ssize_t amdgpu_hwmon_set_pwm1(struct device *dev, value = (value *100 ) /255 ; -if (is_support_sw_smu (adev)) - err =smu_set_fan_speed_percent (&adev->smu, value); -else if (adev->powerplay.pp_funcs->set_fan_speed_percent) +if (adev->powerplay.pp_funcs->set_fan_speed_percent) err =amdgpu_dpm_set_fan_speed_percent (adev, value);else err = -EINVAL ;
@@ -2493,9 +2479,7 @@ static ssize_t amdgpu_hwmon_get_pwm1(struct device *dev,return err; } -if (is_support_sw_smu (adev)) - err =smu_get_fan_speed_percent (&adev->smu, &speed); -else if (adev->powerplay.pp_funcs->get_fan_speed_percent) +if (adev->powerplay.pp_funcs->get_fan_speed_percent) err =amdgpu_dpm_get_fan_speed_percent (adev, &speed);else err = -EINVAL ;
@@ -2528,9 +2512,7 @@ static ssize_t amdgpu_hwmon_get_fan1_input(struct device *dev,return err; } -if (is_support_sw_smu (adev)) - err =smu_get_fan_speed_rpm (&adev->smu, &speed); -else if (adev->powerplay.pp_funcs->get_fan_speed_rpm) +if (adev->powerplay.pp_funcs->get_fan_speed_rpm) err =amdgpu_dpm_get_fan_speed_rpm (adev, &speed);else err = -EINVAL ;
@@ -2621,9 +2603,7 @@ static ssize_t amdgpu_hwmon_get_fan1_target(struct device *dev,return err; } -if (is_support_sw_smu (adev)) - err =smu_get_fan_speed_rpm (&adev->smu, &rpm); -else if (adev->powerplay.pp_funcs->get_fan_speed_rpm) +if (adev->powerplay.pp_funcs->get_fan_speed_rpm) err =amdgpu_dpm_get_fan_speed_rpm (adev, &rpm);else err = -EINVAL ;
@@ -2655,10 +2635,7 @@ static ssize_t amdgpu_hwmon_set_fan1_target(struct device *dev,return err; } -if (is_support_sw_smu (adev)) - pwm_mode =smu_get_fan_control_mode (&adev->smu); -else - pwm_mode =amdgpu_dpm_get_fan_control_mode (adev); + pwm_mode =amdgpu_dpm_get_fan_control_mode (adev);if (pwm_mode !=AMD_FAN_CTRL_MANUAL ) {pm_runtime_mark_last_busy (adev_to_drm (adev)->dev);
@@ -2673,9 +2650,7 @@ static ssize_t amdgpu_hwmon_set_fan1_target(struct device *dev,return err; } -if (is_support_sw_smu (adev)) - err =smu_set_fan_speed_rpm (&adev->smu, value); -else if (adev->powerplay.pp_funcs->set_fan_speed_rpm) +if (adev->powerplay.pp_funcs->set_fan_speed_rpm) err =amdgpu_dpm_set_fan_speed_rpm (adev, value);else err = -EINVAL ;
@@ -2706,18 +2681,14 @@ static ssize_t amdgpu_hwmon_get_fan1_enable(struct device *dev,return ret; } -if (is_support_sw_smu (adev)) { - pwm_mode =smu_get_fan_control_mode (&adev->smu); - }else { -if (!adev->powerplay.pp_funcs->get_fan_control_mode) { -pm_runtime_mark_last_busy (adev_to_drm (adev)->dev); -pm_runtime_put_autosuspend (adev_to_drm (adev)->dev); -return -EINVAL ; - } - - pwm_mode =amdgpu_dpm_get_fan_control_mode (adev); +if (!adev->powerplay.pp_funcs->get_fan_control_mode) { +pm_runtime_mark_last_busy (adev_to_drm (adev)->dev); +pm_runtime_put_autosuspend (adev_to_drm (adev)->dev); +return -EINVAL ; } + pwm_mode =amdgpu_dpm_get_fan_control_mode (adev); +pm_runtime_mark_last_busy (adev_to_drm (adev)->dev);pm_runtime_put_autosuspend (adev_to_drm (adev)->dev);
@@ -2754,16 +2725,12 @@ static ssize_t amdgpu_hwmon_set_fan1_enable(struct device *dev,return err; } -if (is_support_sw_smu (adev)) { -smu_set_fan_control_mode (&adev->smu, pwm_mode); - }else { -if (!adev->powerplay.pp_funcs->set_fan_control_mode) { -pm_runtime_mark_last_busy (adev_to_drm (adev)->dev); -pm_runtime_put_autosuspend (adev_to_drm (adev)->dev); -return -EINVAL ; - } -amdgpu_dpm_set_fan_control_mode (adev, pwm_mode); +if (!adev->powerplay.pp_funcs->set_fan_control_mode) { +pm_runtime_mark_last_busy (adev_to_drm (adev)->dev); +pm_runtime_put_autosuspend (adev_to_drm (adev)->dev); +return -EINVAL ; } +amdgpu_dpm_set_fan_control_mode (adev, pwm_mode);pm_runtime_mark_last_busy (adev_to_drm (adev)->dev);pm_runtime_put_autosuspend (adev_to_drm (adev)->dev);
drivers/gpu/drm/amd/pm/inc/amdgpu_smu.h +6 -6
@@ -657,7 +657,7 @@ int smu_check_fw_status(struct smu_context *smu);int smu_set_gfx_cgpg (struct smu_context *smu,bool enabled); -int smu_set_fan_speed_rpm (struct smu_context *smu,uint32_t speed); +int smu_set_fan_speed_rpm (void *handle,uint32_t speed); int smu_get_power_limit(struct smu_context *smu, uint32_t *limit,
@@ -679,11 +679,11 @@ int smu_set_power_profile_mode(struct smu_context *smu,long *param, uint32_t param_size, bool lock_needed); -int smu_get_fan_control_mode (struct smu_context *smu); -int smu_set_fan_control_mode (struct smu_context *smu,int value); -int smu_get_fan_speed_percent (struct smu_context *smu,uint32_t *speed); -int smu_set_fan_speed_percent (struct smu_context *smu,uint32_t speed); -int smu_get_fan_speed_rpm (struct smu_context *smu,uint32_t *speed); +u32 smu_get_fan_control_mode (void *handle); +void smu_set_fan_control_mode (void *handle,u32 value); +int smu_get_fan_speed_percent (void *handle,u32 *speed); +int smu_set_fan_speed_percent (void *handle,u32 speed); +int smu_get_fan_speed_rpm (void *handle,uint32_t *speed);int smu_set_deep_sleep_dcefclk (struct smu_context *smu,int clk);
drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c +5 -3
@@ -1896,8 +1896,9 @@ int smu_set_gfx_cgpg(struct smu_context *smu, bool enabled)return ret; } -int smu_set_fan_speed_rpm (struct smu_context *smu,uint32_t speed) +int smu_set_fan_speed_rpm (void *handle,uint32_t speed) { +struct smu_context *smu = handle;int ret =0 ;if (!smu->pm_enabled || !smu->adev->pm.dpm_enabled)
@@ -2100,9 +2101,10 @@ int smu_set_power_profile_mode(struct smu_context *smu, } -int smu_get_fan_control_mode (struct smu_context *smu) +u32 smu_get_fan_control_mode (void *handle) { -int ret =0 ; +struct smu_context *smu = handle; +u32 ret =0 ;if (!smu->pm_enabled || !smu->adev->pm.dpm_enabled)return -EOPNOTSUPP ;
[kevin]:
after change function return type to 'u32", the return value of '-EOPNOTSUPP' maybe not work. other patches have the same problems.
@@ -2117,25 +2119,26 @@ int smu_get_fan_control_mode(struct smu_context *smu)
return ret;
}
-int smu_set_fan_control_mode(struct smu_context *smu, int value) +void smu_set_fan_control_mode(void *handle, u32 value)
{
- int ret = 0;
+ struct smu_context *smu = handle;
if (!smu->pm_enabled || !smu->adev->pm.dpm_enabled)
- return -EOPNOTSUPP;
+ return;
mutex_lock(&smu->mutex);
if (smu->ppt_funcs->set_fan_control_mode)- ret = smu->ppt_funcs->set_fan_control_mode(smu, value);
+ smu->ppt_funcs->set_fan_control_mode(smu, value);
mutex_unlock(&smu->mutex);
- return ret;
+ return;
}
-int smu_get_fan_speed_percent(struct smu_context *smu, uint32_t *speed) +int smu_get_fan_speed_percent(void *handle, u32 *speed)
{
+ struct smu_context *smu = handle;
int ret = 0;
uint32_t percent;
uint32_t current_rpm;
@@ -2159,8 +2162,9 @@ int smu_get_fan_speed_percent(struct smu_context *smu, uint32_t *speed)
return ret;}
-int smu_set_fan_speed_percent(struct smu_context *smu, uint32_t speed) +int smu_set_fan_speed_percent(void *handle, u32 speed)
{
+ struct smu_context *smu = handle;
int ret = 0;
uint32_t rpm;@@ -2181,8 +2185,9 @@ int smu_set_fan_speed_percent(struct smu_context *smu, uint32_t speed)
return ret;
}
-int smu_get_fan_speed_rpm(struct smu_context *smu, uint32_t *speed) +int smu_get_fan_speed_rpm(void *handle, uint32_t *speed)
{
+ struct smu_context *smu = handle;
int ret = 0;
if (!smu->pm_enabled || !smu->adev->pm.dpm_enabled)@@ -2564,7 +2569,13 @@ int smu_gfx_state_change_set(struct smu_context *smu, uint32_t state)
static const struct amd_pm_funcs swsmu_dpm_funcs = {
/* export for sysfs */
+ .set_fan_control_mode = smu_set_fan_control_mode,
+ .get_fan_control_mode = smu_get_fan_control_mode,
+ .set_fan_speed_percent = smu_set_fan_speed_percent,
+ .get_fan_speed_percent = smu_get_fan_speed_percent,
.get_performance_level = smu_get_performance_level,
+ .get_fan_speed_rpm = smu_get_fan_speed_rpm,
+ .set_fan_speed_rpm = smu_set_fan_speed_rpm, .switch_power_profile = smu_switch_power_profile, /* export to amdgpu */
.set_mp1_state = smu_set_mp1_state,
--
2.25.1
_______________________________________________
amd-gfx mailing list
[email protected]
https://nam11.safelinks.protection.outlook.com/?url=https%3A%2F%2Flists.freedesktop.org%2Fmailman%2Flistinfo%2Famd-gfx&data=04%7C01%7CKevin1.Wang%40amd.com%7C5e2363bd852d4f676cfe08d8a3b7e638%7C3dd8961fe4884e608e11a82d994e183d%7C0%7C0%7C637439357534767356%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C1000&sdata=ncJ6EcwqNogU9oiPX%2BbA99o%2FST67HR3r7e4cMiKZiY8%3D&reserved=0
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
Re: [PATCH 4/8] amdgpu/pm: Powerplay API for smu , changed 9 pm power functions to use API
In reply to Darren Powell[AMD Official Use Only - Internal Distribution Only]
________________________________
From: amd-gfx <[email protected]> on behalf of Darren Powell <[email protected]>
Sent: Saturday, December 19, 2020 8:48 AM
To: [email protected] <[email protected]>
Cc: Powell, Darren <[email protected]>
Subject: [PATCH 4/8] amdgpu/pm: Powerplay API for smu , changed 9 pm power functions to use API
Modified Files
smu_get_power_limit() - modifed arg0 to match Powerplay API get_power_limit smu_set_power_limit() - modifed arg0 to match Powerplay API set_power_limit smu_sys_get_pp_table() - modifed signature to match Powerplay API get_pp_table smu_get_power_num_states() - modifed arg0 to match Powerplay API get_pp_num_states
smu_get_current_power_state() - modifed arg0 to match Powerplay API get_current_power_state smu_sys_get_pp_feature_mask() - modifed signature to match Powerplay API get_ppfeature_status smu_sys_set_pp_feature_mask() - modifed arg0 to match Powerplay API set_ppfeature_status
Other Changes
added 7 above smu Powerplay functions to swsmu_dpm_funcs
removed special smu handling of above functions and called through Powerplay API
--- drivers/gpu/drm/amd/pm/amdgpu_pm.c | 73 ++++++++--------------- drivers/gpu/drm/amd/pm/inc/amdgpu_smu.h | 16 +++-- drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c | 59 +++++++++++------- 3 files changed, 69 insertions(+), 79 deletions(-)
drivers/gpu/drm/amd/pm/amdgpu_pm.c +16 -24
@@ -124,6 +124,7 @@ static ssize_t amdgpu_get_power_dpm_state(struct device *dev, {struct drm_device *ddev =dev_get_drvdata (dev);struct amdgpu_device *adev =drm_to_adev (ddev); +const struct amd_pm_funcs *pp_funcs = adev->powerplay.pp_funcs;enum amd_pm_state_type pm;int ret;
@@ -136,12 +137,7 @@ static ssize_t amdgpu_get_power_dpm_state(struct device *dev,return ret; } -if (is_support_sw_smu (adev)) { -if (adev->smu.ppt_funcs->get_current_power_state) - pm =smu_get_current_power_state (&adev->smu); -else - pm = adev->pm.dpm.user_state; - }else if (adev->powerplay.pp_funcs->get_current_power_state) { +if (pp_funcs->get_current_power_state) { pm =amdgpu_dpm_get_current_power_state (adev); }else { pm = adev->pm.dpm.user_state;
@@ -307,6 +303,7 @@ static ssize_t amdgpu_set_power_dpm_force_performance_level(struct device *dev, {struct drm_device *ddev =dev_get_drvdata (dev);struct amdgpu_device *adev =drm_to_adev (ddev); +const struct amd_pm_funcs *pp_funcs = adev->powerplay.pp_funcs;enum amd_dpm_forced_level level;enum amd_dpm_forced_level current_level =0xff ;int ret =0 ;
@@ -342,9 +339,7 @@ static ssize_t amdgpu_set_power_dpm_force_performance_level(struct device *dev,return ret; } -if (is_support_sw_smu (adev)) - current_level =smu_get_performance_level (&adev->smu); -else if (adev->powerplay.pp_funcs->get_performance_level) +if (pp_funcs->get_performance_level) current_level =amdgpu_dpm_get_performance_level (adev);if (current_level == level) {
@@ -381,7 +376,7 @@ static ssize_t amdgpu_set_power_dpm_force_performance_level(struct device *dev,pm_runtime_put_autosuspend (ddev->dev);return -EINVAL ; } - }else if (adev->powerplay.pp_funcs->force_performance_level) { + }else if (pp_funcs->force_performance_level) {mutex_lock (&adev->pm.mutex);if (adev->pm.dpm.thermal_active) {mutex_unlock (&adev->pm.mutex);
@@ -412,6 +407,7 @@ static ssize_t amdgpu_get_pp_num_states(struct device *dev, {struct drm_device *ddev =dev_get_drvdata (dev);struct amdgpu_device *adev =drm_to_adev (ddev); +const struct amd_pm_funcs *pp_funcs = adev->powerplay.pp_funcs;struct pp_states_info data;int i, buf_len, ret;
@@ -424,12 +420,10 @@ static ssize_t amdgpu_get_pp_num_states(struct device *dev,return ret; } -if (is_support_sw_smu (adev)) { - ret =smu_get_power_num_states (&adev->smu, &data); -if (ret) +if (pp_funcs->get_pp_num_states) { + ret =amdgpu_dpm_get_pp_num_states (adev, &data); +if (is_support_sw_smu (adev) && ret)return ret; - }else if (adev->powerplay.pp_funcs->get_pp_num_states) { -amdgpu_dpm_get_pp_num_states (adev, &data); }else {memset (&data,0 ,sizeof (data)); }
@@ -454,8 +448,8 @@ static ssize_t amdgpu_get_pp_cur_state(struct device *dev, {struct drm_device *ddev =dev_get_drvdata (dev);struct amdgpu_device *adev =drm_to_adev (ddev); +const struct amd_pm_funcs *pp_funcs = adev->powerplay.pp_funcs;struct pp_states_info data; -struct smu_context *smu = &adev->smu;enum amd_pm_state_type pm =0 ;int i =0 , ret =0 ;
@@ -468,15 +462,13 @@ static ssize_t amdgpu_get_pp_cur_state(struct device *dev,return ret; } -if (is_support_sw_smu (adev)) { - pm =smu_get_current_power_state (smu); - ret =smu_get_power_num_states (smu, &data); -if (ret) -return ret; - }else if (adev->powerplay.pp_funcs->get_current_power_state - && adev->powerplay.pp_funcs->get_pp_num_states) { +if (pp_funcs->get_current_power_state + && pp_funcs->get_pp_num_states) { pm =amdgpu_dpm_get_current_power_state (adev); -amdgpu_dpm_get_pp_num_states (adev, &data); + ret =amdgpu_dpm_get_pp_num_states (adev, &data); + +if (is_support_sw_smu (adev) && ret) +return ret;
[kevin]:
why we need this workaround for swsmu ?
after using amd_pm_funcs as a proxy, these judgments should not be required. otherwise, can you help me understand it , thanks.
}
pm_runtime_mark_last_busy(ddev->dev);
@@ -589,13 +581,7 @@ static ssize_t amdgpu_get_pp_table(struct device *dev,
return ret;
}- if (is_support_sw_smu(adev)) {
- size = smu_sys_get_pp_table(&adev->smu, (void **)&table);
- pm_runtime_mark_last_busy(ddev->dev);
- pm_runtime_put_autosuspend(ddev->dev);
- if (size < 0)
- return size;
- } else if (adev->powerplay.pp_funcs->get_pp_table) {
+ if (adev->powerplay.pp_funcs->get_pp_table) {
size = amdgpu_dpm_get_pp_table(adev, &table);
pm_runtime_mark_last_busy(ddev->dev);
pm_runtime_put_autosuspend(ddev->dev);
@@ -989,9 +975,7 @@ static ssize_t amdgpu_get_pp_features(struct device *dev,
return ret;
}- if (is_support_sw_smu(adev))
- size = smu_sys_get_pp_feature_mask(&adev->smu, buf);
- else if (adev->powerplay.pp_funcs->get_ppfeature_status)
+ if (adev->powerplay.pp_funcs->get_ppfeature_status)
size = amdgpu_dpm_get_ppfeature_status(adev, buf);
else
size = snprintf(buf, PAGE_SIZE, "\n");
@@ -2862,6 +2846,7 @@ static ssize_t amdgpu_hwmon_show_power_cap_max(struct device *dev,
char *buf)
{
struct amdgpu_device *adev = dev_get_drvdata(dev);
+ const struct amd_pm_funcs *pp_funcs = adev->powerplay.pp_funcs;
uint32_t limit = 0;
ssize_t size;
int r;
@@ -2875,10 +2860,7 @@ static ssize_t amdgpu_hwmon_show_power_cap_max(struct device *dev,
return r;
}- if (is_support_sw_smu(adev)) {
- smu_get_power_limit(&adev->smu, &limit, true);
- size = snprintf(buf, PAGE_SIZE, "%u\n", limit * 1000000);
- } else if (adev->powerplay.pp_funcs && adev->powerplay.pp_funcs->get_power_limit) {
+ if (pp_funcs && pp_funcs->get_power_limit) {
adev->powerplay.pp_funcs->get_power_limit(adev->powerplay.pp_handle, &limit, true);
size = snprintf(buf, PAGE_SIZE, "%u\n", limit * 1000000);
} else {
@@ -2896,6 +2878,7 @@ static ssize_t amdgpu_hwmon_show_power_cap(struct device *dev,
char *buf)
{
struct amdgpu_device *adev = dev_get_drvdata(dev);
+ const struct amd_pm_funcs *pp_funcs = adev->powerplay.pp_funcs;
uint32_t limit = 0;
ssize_t size;
int r;
@@ -2909,11 +2892,8 @@ static ssize_t amdgpu_hwmon_show_power_cap(struct device *dev,
return r;
}- if (is_support_sw_smu(adev)) {
- smu_get_power_limit(&adev->smu, &limit, false);
- size = snprintf(buf, PAGE_SIZE, "%u\n", limit * 1000000);
- } else if (adev->powerplay.pp_funcs && adev->powerplay.pp_funcs->get_power_limit) {
- adev->powerplay.pp_funcs->get_power_limit(adev->powerplay.pp_handle, &limit, false);
+ if (pp_funcs && pp_funcs->get_power_limit) {
+ pp_funcs->get_power_limit(adev->powerplay.pp_handle, &limit, false);
size = snprintf(buf, PAGE_SIZE, "%u\n", limit * 1000000);
} else {
size = snprintf(buf, PAGE_SIZE, "\n");
@@ -2932,6 +2912,7 @@ static ssize_t amdgpu_hwmon_set_power_cap(struct device *dev,
size_t count)
{
struct amdgpu_device *adev = dev_get_drvdata(dev);
+ const struct amd_pm_funcs *pp_funcs = adev->powerplay.pp_funcs;
int err;
u32 value;@@ -2954,10 +2935,8 @@ static ssize_t amdgpu_hwmon_set_power_cap(struct device *dev,
return err;
}- if (is_support_sw_smu(adev))
- err = smu_set_power_limit(&adev->smu, value);
- else if (adev->powerplay.pp_funcs && adev->powerplay.pp_funcs->set_power_limit)
- err = adev->powerplay.pp_funcs->set_power_limit(adev->powerplay.pp_handle, value);
+ if (pp_funcs && pp_funcs->set_power_limit)
+ err = pp_funcs->set_power_limit(adev->powerplay.pp_handle, value);
else
err = -EINVAL;drivers/gpu/drm/amd/pm/inc/amdgpu_smu.h +7 -9
@@ -659,11 +659,9 @@ int smu_set_gfx_cgpg(struct smu_context *smu, bool enabled);int smu_set_fan_speed_rpm (void *handle,uint32_t speed); -int smu_get_power_limit (struct smu_context *smu, -uint32_t *limit, -bool max_setting); +int smu_get_power_limit (void *handle,uint32_t *limit,bool max_setting); -int smu_set_power_limit (struct smu_context *smu,uint32_t limit); +int smu_set_power_limit (void *handle,uint32_t limit);int smu_print_clk_levels (struct smu_context *smu,enum smu_clk_type clk_type,char *buf); int smu_od_edit_dpm_table(struct smu_context *smu,
@@ -718,10 +716,10 @@ extern const struct amdgpu_ip_block_version smu_v12_0_ip_block;bool is_support_sw_smu (struct amdgpu_device *adev);int smu_reset (struct smu_context *smu); -int smu_sys_get_pp_table (struct smu_context *smu,void **table); +int smu_sys_get_pp_table (void *handle,char **table);int smu_sys_set_pp_table (struct smu_context *smu,void *buf,size_t size); -int smu_get_power_num_states (struct smu_context *smu,struct pp_states_info *state_info); -enum amd_pm_state_type smu_get_current_power_state (struct smu_context *smu); +int smu_get_power_num_states (void *handle,struct pp_states_info *state_info); +enum amd_pm_state_type smu_get_current_power_state (void *handle);int smu_write_watermarks_table (struct smu_context *smu); int smu_set_watermarks_for_clock_ranges( struct smu_context *smu,
@@ -747,8 +745,8 @@ enum amd_dpm_forced_level smu_get_performance_level(void *handle);int smu_force_performance_level (struct smu_context *smu,enum amd_dpm_forced_level level);int smu_set_display_count (struct smu_context *smu,uint32_t count);int smu_set_ac_dc (struct smu_context *smu); -size_t smu_sys_get_pp_feature_mask (struct smu_context *smu,char *buf); -int smu_sys_set_pp_feature_mask (struct smu_context *smu,uint64_t new_mask); +int smu_sys_get_pp_feature_mask (void *handle,char *buf); +int smu_sys_set_pp_feature_mask (void *handle,uint64_t new_mask);int smu_force_clk_levels (struct smu_context *smu,enum smu_clk_type clk_type,uint32_t mask);
drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c +36 -23
112 lines not on this page · raw message
[kevin]:
the blank line is not neccessary,
please use "checkpatch.pl' to check coding style problems before patch review.
};
--
2.25.1
_______________________________________________
amd-gfx mailing list
[email protected]
https://nam11.safelinks.protection.outlook.com/?url=https%3A%2F%2Flists.freedesktop.org%2Fmailman%2Flistinfo%2Famd-gfx&data=04%7C01%7CKevin1.Wang%40amd.com%7Cadb6f74a626d43c7614408d8a3b7e7c2%7C3dd8961fe4884e608e11a82d994e183d%7C0%7C0%7C637439357569667769%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C1000&sdata=l9C5i335WmTBCjhwE41%2B3Fi5ZSHP15IhY4qsQCGFzWo%3D&reserved=0
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx