Modify smu_get_power_limit to implement Powerplay API
Subsystems (3)
v3 cover Modify smu_get_power_limit to implement Powerplay API
=== Description ===
modify smu_get_power_limit to implement Powerplay API
v3: renamed enum pp_power_sample_window to enum pp_power_limit
v2: rewrote the patchset to use two enums as args to get_power
=== Test System ===
* DESKTOP(AMD FX-8350 + NAVI10(731F/ca), BIOS: F2)
+ ISO(Ubuntu 20.04.1 LTS)
+ Kernel(5.11.0-custom-fdoagd5f)
=== Patch Summary ===
linux: ([email protected]:agd5f) origin/amd-staging-drm-next @ 3ac16cf10525
+ 1a7ee0a2bc79 amdgpu/pm: reorder definition of swsmu_pm_funcs for readability
+ 3d0481caced7 amdgpu/pm: clean up smu_get_power_limit function signature
+ 593d896cf90c amdgpu/pm: modify Powerplay API get_power_limit to use new pp_power enums
+ 45339b7190fc amdgpu/pm: modify and add smu_get_power_limit to Powerplay API
+ 8f4be6d2a9df amdgpu/pm: handle return value for get_power_limit
+ a2e5f8ecd04f amdgpu/pm: add kernel documentation for smu_get_power_limit
=== Tests ===
==== get_power_limit Test ====
* Test
AMDGPU_PCI_ADDR=lspci -nn | grep "VGA\|Display" | cut -d " " -f 1 AMDGPU_HWMON=ls -la /sys/class/hwmon | grep $AMDGPU_PCI_ADDR | cut -d " " -f 11 HWMON_DIR=/sys/class/hwmon/${AMDGPU_HWMON}
lspci -nn | grep "VGA\|Display" ; \
echo "=== power1 cap ===" ; cat $HWMON_DIR/power1_cap ; \
echo "=== power1 cap max ===" ; cat $HWMON_DIR/power1_cap_max ; \
echo "=== power1 cap def ===" ; cat $HWMON_DIR/power1_cap_default
==== Documentation Test ====
* Insert temp documentation
** Documentation/gpu/amdgpu.rst
vi Documentation/gpu/amdgpu.rst
** added text to start
------------START------------
Documentation Testing
=====================
Power Limit
-----------
.. kernel-doc:: drivers/gpu/drm/amd/include/kgd_pp_interface.h
:doc: amdgpu_pp_power
.. kernel-doc:: drivers/gpu/drm/amd/include/kgd_pp_interface.h
:identifiers: pp_power_limit_level
.. kernel-doc:: drivers/gpu/drm/amd/include/kgd_pp_interface.h
:identifiers: pp_power_type
.. kernel-doc:: drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c
:identifiers: smu_get_power_limit
-------------END-------------
* Setup
cd ~/workspace/linux
. sphinx_2.4.4/bin/activate
* Build
export SPHINXDOCLOG=sphinx.build.log
cp $SPHINXDOCLOG{,.old}
time make -j 8 htmldocs |& tee $SPHINXDOCLOG
* View
firefox file:///home/dapowell/workspace/linux/Documentation/output/gpu/amdgpu.html
Darren Powell (6):
amdgpu/pm: reorder definition of swsmu_pm_funcs for readability amdgpu/pm: clean up smu_get_power_limit function signature amdgpu/pm: modify Powerplay API get_power_limit to use new pp_power
enums
amdgpu/pm: modify and add smu_get_power_limit to Powerplay API amdgpu/pm: handle return value for get_power_limit amdgpu/pm: add kernel documentation for smu_get_power_limit
.../gpu/drm/amd/include/kgd_pp_interface.h | 47 ++++++++- drivers/gpu/drm/amd/pm/amdgpu_pm.c | 64 +++++++------ drivers/gpu/drm/amd/pm/inc/amdgpu_smu.h | 5 +- .../gpu/drm/amd/pm/powerplay/amd_powerplay.c | 33 ++++--- drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c | 96 +++++++++++++------ 5 files changed, 172 insertions(+), 73 deletions(-)
base-commit: f60839821f77d6db48bfc986e0391b70b31fede8
Signature · 6 lines
2.31.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH v3 1/6 amdgpu/pm: reorder definition of swsmu_pm_funcs for readability
Match the order of definition to the structure's declaration to help with locating included and missing functions of the API
--- drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c | 48 +++++++++++------------ 1 file changed, 24 insertions(+), 24 deletions(-)
drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c +24 -24
@@ -2969,6 +2969,8 @@ static const struct amd_pm_funcs swsmu_pm_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_clock_level = smu_force_ppclk_levels, + .print_clock_levels = smu_print_ppclk_levels, .force_performance_level = smu_force_performance_level, .read_sensor = smu_read_sensor, .get_performance_level = smu_get_performance_level,
@@ -2981,38 +2983,36 @@ static const struct amd_pm_funcs swsmu_pm_funcs = { .switch_power_profile = smu_switch_power_profile,/* export to amdgpu */ .dispatch_tasks = smu_handle_dpm_task, + .load_firmware = smu_load_microcode, .set_powergating_by_smu = smu_dpm_set_power_gate, .set_power_limit = smu_set_power_limit, + .get_power_profile_mode = smu_get_power_profile_mode, + .set_power_profile_mode = smu_set_power_profile_mode, .odn_edit_dpm_table = smu_od_edit_dpm_table, .set_mp1_state = smu_set_mp1_state, + .gfx_state_change_set = smu_gfx_state_change_set,/* export to DC */ - .get_sclk = smu_get_sclk, - .get_mclk = smu_get_mclk, - .enable_mgpu_fan_boost = smu_enable_mgpu_fan_boost, - .get_asic_baco_capability = smu_get_baco_capability, - .set_asic_baco_state = smu_baco_set_state, - .get_ppfeature_status = smu_sys_get_pp_feature_mask, - .set_ppfeature_status = smu_sys_set_pp_feature_mask, - .asic_reset_mode_2 = smu_mode2_reset, - .set_df_cstate = smu_set_df_cstate, - .set_xgmi_pstate = smu_set_xgmi_pstate, - .get_gpu_metrics = smu_sys_get_gpu_metrics, - .set_power_profile_mode = smu_set_power_profile_mode, - .get_power_profile_mode = smu_get_power_profile_mode, - .force_clock_level = smu_force_ppclk_levels, - .print_clock_levels = smu_print_ppclk_levels, - .get_uclk_dpm_states = smu_get_uclk_dpm_states, - .get_dpm_clock_table = smu_get_dpm_clock_table, - .display_configuration_change = smu_display_configuration_change, - .get_clock_by_type_with_latency = smu_get_clock_by_type_with_latency, - .display_clock_voltage_request = smu_display_clock_voltage_request, - .set_active_display_count = smu_set_display_count, - .set_min_deep_sleep_dcefclk = smu_set_deep_sleep_dcefclk, + .get_sclk = smu_get_sclk, + .get_mclk = smu_get_mclk, + .display_configuration_change = smu_display_configuration_change, + .get_clock_by_type_with_latency = smu_get_clock_by_type_with_latency, + .display_clock_voltage_request = smu_display_clock_voltage_request, + .enable_mgpu_fan_boost = smu_enable_mgpu_fan_boost, + .set_active_display_count = smu_set_display_count, + .set_min_deep_sleep_dcefclk = smu_set_deep_sleep_dcefclk, + .get_asic_baco_capability = smu_get_baco_capability, + .set_asic_baco_state = smu_baco_set_state, + .get_ppfeature_status = smu_sys_get_pp_feature_mask, + .set_ppfeature_status = smu_sys_set_pp_feature_mask, + .asic_reset_mode_2 = smu_mode2_reset, + .set_df_cstate = smu_set_df_cstate, + .set_xgmi_pstate = smu_set_xgmi_pstate, + .get_gpu_metrics = smu_sys_get_gpu_metrics, .set_watermarks_for_clock_ranges = smu_set_watermarks_for_clock_ranges, .display_disable_memory_clock_switch = smu_display_disable_memory_clock_switch, .get_max_sustainable_clocks_by_dc = smu_get_max_sustainable_clocks_by_dc, - .load_firmware = smu_load_microcode, - .gfx_state_change_set = smu_gfx_state_change_set, + .get_uclk_dpm_states = smu_get_uclk_dpm_states, + .get_dpm_clock_table = smu_get_dpm_clock_table, .get_smu_prv_buf_details = smu_get_prv_buffer_details, };
Signature · 6 lines
2.31.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH v3 2/6 amdgpu/pm: clean up smu_get_power_limit function signature
In reply to Darren Powell add two new powerplay enums (limit_level, type) add enums to smu_get_power_limit signature remove input bitfield stuffing of output variable limit update calls to smu_get_power_limit
* Test
AMDGPU_PCI_ADDR=lspci -nn | grep "VGA\|Display" | cut -d " " -f 1 AMDGPU_HWMON=ls -la /sys/class/hwmon | grep $AMDGPU_PCI_ADDR | cut -d " " -f 11 HWMON_DIR=/sys/class/hwmon/${AMDGPU_HWMON}
lspci -nn | grep "VGA\|Display" ; \
echo "=== power1 cap ===" ; cat $HWMON_DIR/power1_cap ; \
echo "=== power1 cap max ===" ; cat $HWMON_DIR/power1_cap_max ; \
echo "=== power1 cap def ===" ; cat $HWMON_DIR/power1_cap_default
--- .../gpu/drm/amd/include/kgd_pp_interface.h | 14 ++++++++ drivers/gpu/drm/amd/pm/amdgpu_pm.c | 18 +++++----- drivers/gpu/drm/amd/pm/inc/amdgpu_smu.h | 3 +- drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c | 34 +++++++++++++++++-- 4 files changed, 57 insertions(+), 12 deletions(-)
drivers/gpu/drm/amd/include/kgd_pp_interface.h +14 -0
@@ -194,6 +194,20 @@ enum pp_df_cstate { DF_CSTATE_ALLOW, }; +enum pp_power_limit_level +{ +PP_PWR_LIMIT_MIN =-1 , +PP_PWR_LIMIT_CURRENT , +PP_PWR_LIMIT_DEFAULT , +PP_PWR_LIMIT_MAX , +}; + +enum pp_power_type +{ +PP_PWR_TYPE_SUSTAINED , +PP_PWR_TYPE_FAST , +}; +#define PP_GROUP_MASK 0xF0000000#define PP_GROUP_SHIFT 28
drivers/gpu/drm/amd/pm/amdgpu_pm.c +9 -9
@@ -2907,8 +2907,8 @@ static ssize_t amdgpu_hwmon_show_power_cap_max(struct device *dev, {struct amdgpu_device *adev =dev_get_drvdata (dev);const struct amd_pm_funcs *pp_funcs = adev->powerplay.pp_funcs; -int limit_type =to_sensor_dev_attr (attr)->index; -uint32_t limit = limit_type <<24 ; +enum pp_power_type power_type =to_sensor_dev_attr (attr)->index; +uint32_t limit;uint32_t max_limit =0 ;ssize_t size;int r;
@@ -2925,7 +2925,7 @@ static ssize_t amdgpu_hwmon_show_power_cap_max(struct device *dev, }if (is_support_sw_smu (adev)) { -smu_get_power_limit (&adev->smu, &limit,SMU_PPT_LIMIT_MAX ); +smu_get_power_limit (&adev->smu, &limit,PP_PWR_LIMIT_MAX , power_type); size =snprintf (buf,PAGE_SIZE ,"%u\n" , limit *1000000 ); }else if (pp_funcs && pp_funcs->get_power_limit) { pp_funcs->get_power_limit(adev->powerplay.pp_handle,
@@ -2947,8 +2947,8 @@ static ssize_t amdgpu_hwmon_show_power_cap(struct device *dev, {struct amdgpu_device *adev =dev_get_drvdata (dev);const struct amd_pm_funcs *pp_funcs = adev->powerplay.pp_funcs; -int limit_type =to_sensor_dev_attr (attr)->index; -uint32_t limit = limit_type <<24 ; +enum pp_power_type power_type =to_sensor_dev_attr (attr)->index; +uint32_t limit;ssize_t size;int r;
@@ -2964,7 +2964,7 @@ static ssize_t amdgpu_hwmon_show_power_cap(struct device *dev, }if (is_support_sw_smu (adev)) { -smu_get_power_limit (&adev->smu, &limit,SMU_PPT_LIMIT_CURRENT ); +smu_get_power_limit (&adev->smu, &limit,PP_PWR_LIMIT_CURRENT , power_type); size =snprintf (buf,PAGE_SIZE ,"%u\n" , limit *1000000 ); }else if (pp_funcs && pp_funcs->get_power_limit) { pp_funcs->get_power_limit(adev->powerplay.pp_handle,
@@ -2986,8 +2986,8 @@ static ssize_t amdgpu_hwmon_show_power_cap_default(struct device *dev, {struct amdgpu_device *adev =dev_get_drvdata (dev);const struct amd_pm_funcs *pp_funcs = adev->powerplay.pp_funcs; -int limit_type =to_sensor_dev_attr (attr)->index; -uint32_t limit = limit_type <<24 ; +enum pp_power_type power_type =to_sensor_dev_attr (attr)->index; +uint32_t limit;ssize_t size;int r;
@@ -3003,7 +3003,7 @@ static ssize_t amdgpu_hwmon_show_power_cap_default(struct device *dev, }if (is_support_sw_smu (adev)) { -smu_get_power_limit (&adev->smu, &limit,SMU_PPT_LIMIT_DEFAULT ); +smu_get_power_limit (&adev->smu, &limit,PP_PWR_LIMIT_DEFAULT , power_type); size =snprintf (buf,PAGE_SIZE ,"%u\n" , limit *1000000 ); }else if (pp_funcs && pp_funcs->get_power_limit) { pp_funcs->get_power_limit(adev->powerplay.pp_handle,
drivers/gpu/drm/amd/pm/inc/amdgpu_smu.h +2 -1
@@ -1264,7 +1264,8 @@ enum smu_cmn2asic_mapping_type {#if !defined(SWSMU_CODE_LAYER_L2 ) && !defined(SWSMU_CODE_LAYER_L3 ) && !defined(SWSMU_CODE_LAYER_L4 )int smu_get_power_limit (struct smu_context *smu,uint32_t *limit, -enum smu_ppt_limit_level limit_level); +enum pp_power_limit_level pp_limit_level, +enum pp_power_type pp_power_type);bool smu_mode1_reset_is_support (struct smu_context *smu);bool smu_mode2_reset_is_support (struct smu_context *smu);
drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c +32 -2
@@ -2175,14 +2175,44 @@ static int smu_set_fan_speed_rpm(void *handle, uint32_t speed)int smu_get_power_limit (struct smu_context *smu,uint32_t *limit, -enum smu_ppt_limit_level limit_level) +enum pp_power_limit_level pp_limit_level, +enum pp_power_type pp_power_type) { -uint32_t limit_type = *limit >>24 ; +enum smu_ppt_limit_level limit_level; +uint32_t limit_type;int ret =0 ;if (!smu->pm_enabled || !smu->adev->pm.dpm_enabled)return -EOPNOTSUPP ; +switch (pp_power_type) { +case PP_PWR_TYPE_SUSTAINED : + limit_type =SMU_DEFAULT_PPT_LIMIT ; +break ; +case PP_PWR_TYPE_FAST : + limit_type =SMU_FAST_PPT_LIMIT ; +break ; +default : +return -EOPNOTSUPP ; +break ; + } + +switch (pp_limit_level){ +case PP_PWR_LIMIT_CURRENT : + limit_level =SMU_PPT_LIMIT_CURRENT ; +break ; +case PP_PWR_LIMIT_DEFAULT : + limit_level =SMU_PPT_LIMIT_DEFAULT ; +break ; +case PP_PWR_LIMIT_MAX : + limit_level =SMU_PPT_LIMIT_MAX ; +break ; +case PP_PWR_LIMIT_MIN : +default : +return -EOPNOTSUPP ; +break ; + } +mutex_lock (&smu->mutex);if (limit_type !=SMU_DEFAULT_PPT_LIMIT ) {
Signature · 6 lines
2.31.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH v3 3/6 amdgpu/pm: modify Powerplay API get_power_limit to use new pp_power enums
In reply to Darren Powell updated {amd_pm_funcs}->get_power_limit() signature rewrote pp_get_power_limit to use new enums pp_get_power_limit now returns -EOPNOTSUPP for unknown power limit update calls to {amd_pm_funcs}->get_power_limit()
* Test Notes
* testing hardware was NAVI10 (tests SMU path)
** needs testing on VANGOGH
** needs testing on SMU < 11
** ie, one of
TOPAZ, FIJI, TONGA, POLARIS10, POLARIS11, POLARIS12, VEGAM, CARRIZO, STONEY, VEGA10, VEGA12,VEGA20, RAVEN, BONAIRE, HAWAII
* Test
AMDGPU_PCI_ADDR=lspci -nn | grep "VGA\|Display" | cut -d " " -f 1 AMDGPU_HWMON=ls -la /sys/class/hwmon | grep $AMDGPU_PCI_ADDR | cut -d " " -f 11 HWMON_DIR=/sys/class/hwmon/${AMDGPU_HWMON}
lspci -nn | grep "VGA\|Display" ; \
echo "=== power1 cap ===" ; cat $HWMON_DIR/power1_cap ; \
echo "=== power1 cap max ===" ; cat $HWMON_DIR/power1_cap_max ; \
echo "=== power1 cap def ===" ; cat $HWMON_DIR/power1_cap_default
--- .../gpu/drm/amd/include/kgd_pp_interface.h | 5 +-- drivers/gpu/drm/amd/pm/amdgpu_pm.c | 27 ++++++++------- .../gpu/drm/amd/pm/powerplay/amd_powerplay.c | 33 ++++++++++++------- 3 files changed, 41 insertions(+), 24 deletions(-)
drivers/gpu/drm/amd/include/kgd_pp_interface.h +3 -2
@@ -307,8 +307,9 @@ struct amd_pm_funcs { uint32_t block_type, bool gate);int (*set_clockgating_by_smu)(void *handle,uint32_t msg_id);int (*set_power_limit)(void *handle,uint32_t n); -int (*get_power_limit)(void *handle,uint32_t *limit,uint32_t *max_limit, -bool default_limit); +int (*get_power_limit)(void *handle,uint32_t *limit, +enum pp_power_limit_level pp_limit_level, +enum pp_power_type power_type);int (*get_power_profile_mode)(void *handle,char *buf);int (*set_power_profile_mode)(void *handle,long *input,uint32_t size);int (*set_fine_grain_clk_vol)(void *handle,uint32_t type,long *input,uint32_t size);
drivers/gpu/drm/amd/pm/amdgpu_pm.c +16 -11
@@ -2908,8 +2908,8 @@ static ssize_t amdgpu_hwmon_show_power_cap_max(struct device *dev,struct amdgpu_device *adev =dev_get_drvdata (dev);const struct amd_pm_funcs *pp_funcs = adev->powerplay.pp_funcs;enum pp_power_type power_type =to_sensor_dev_attr (attr)->index; +enum pp_power_limit_level pp_limit_level =PP_PWR_LIMIT_MAX ;uint32_t limit; -uint32_t max_limit =0 ;ssize_t size;int r;
@@ -2925,12 +2925,13 @@ static ssize_t amdgpu_hwmon_show_power_cap_max(struct device *dev, }if (is_support_sw_smu (adev)) { -smu_get_power_limit (&adev->smu, &limit,PP_PWR_LIMIT_MAX , power_type); +smu_get_power_limit (&adev->smu, &limit, + pp_limit_level, power_type); size =snprintf (buf,PAGE_SIZE ,"%u\n" , limit *1000000 ); }else if (pp_funcs && pp_funcs->get_power_limit) { - pp_funcs->get_power_limit (adev->powerplay.pp_handle, - &limit, &max_limit, true); - size =snprintf (buf,PAGE_SIZE ,"%u\n" , max_limit *1000000 ); + pp_funcs->get_power_limit (adev->powerplay.pp_handle, &limit, + pp_limit_level, power_type); + size =snprintf (buf,PAGE_SIZE ,"%u\n" , limit *1000000 ); }else { size =snprintf (buf,PAGE_SIZE ,"\n" ); }
@@ -2948,6 +2949,7 @@ static ssize_t amdgpu_hwmon_show_power_cap(struct device *dev,struct amdgpu_device *adev =dev_get_drvdata (dev);const struct amd_pm_funcs *pp_funcs = adev->powerplay.pp_funcs;enum pp_power_type power_type =to_sensor_dev_attr (attr)->index; +enum pp_power_limit_level pp_limit_level =PP_PWR_LIMIT_CURRENT ;uint32_t limit;ssize_t size;int r;
@@ -2964,11 +2966,12 @@ static ssize_t amdgpu_hwmon_show_power_cap(struct device *dev, }if (is_support_sw_smu (adev)) { -smu_get_power_limit (&adev->smu, &limit,PP_PWR_LIMIT_CURRENT , power_type); +smu_get_power_limit (&adev->smu, &limit, + pp_limit_level, power_type); size =snprintf (buf,PAGE_SIZE ,"%u\n" , limit *1000000 ); }else if (pp_funcs && pp_funcs->get_power_limit) { - pp_funcs->get_power_limit (adev->powerplay.pp_handle, - &limit,NULL , false); + pp_funcs->get_power_limit (adev->powerplay.pp_handle, &limit, + pp_limit_level, power_type); size =snprintf (buf,PAGE_SIZE ,"%u\n" , limit *1000000 ); }else { size =snprintf (buf,PAGE_SIZE ,"\n" );
@@ -2987,6 +2990,7 @@ static ssize_t amdgpu_hwmon_show_power_cap_default(struct device *dev,struct amdgpu_device *adev =dev_get_drvdata (dev);const struct amd_pm_funcs *pp_funcs = adev->powerplay.pp_funcs;enum pp_power_type power_type =to_sensor_dev_attr (attr)->index; +enum pp_power_limit_level pp_limit_level =PP_PWR_LIMIT_DEFAULT ;uint32_t limit;ssize_t size;int r;
@@ -3003,11 +3007,12 @@ static ssize_t amdgpu_hwmon_show_power_cap_default(struct device *dev, }if (is_support_sw_smu (adev)) { -smu_get_power_limit (&adev->smu, &limit,PP_PWR_LIMIT_DEFAULT , power_type); +smu_get_power_limit (&adev->smu, &limit, + pp_limit_level, power_type); size =snprintf (buf,PAGE_SIZE ,"%u\n" , limit *1000000 ); }else if (pp_funcs && pp_funcs->get_power_limit) { - pp_funcs->get_power_limit (adev->powerplay.pp_handle, - &limit,NULL , true); + pp_funcs->get_power_limit (adev->powerplay.pp_handle, &limit, + pp_limit_level, power_type); size =snprintf (buf,PAGE_SIZE ,"%u\n" , limit *1000000 ); }else { size =snprintf (buf,PAGE_SIZE ,"\n" );
drivers/gpu/drm/amd/pm/powerplay/amd_powerplay.c +22 -11
@@ -1035,31 +1035,42 @@ static int pp_set_power_limit(void *handle, uint32_t limit) }static int pp_get_power_limit (void *handle,uint32_t *limit, -uint32_t *max_limit,bool default_limit) +enum pp_power_limit_level pp_limit_level, +enum pp_power_type power_type) {struct pp_hwmgr *hwmgr = handle; +int ret =0 ;if (!hwmgr || !hwmgr->pm_en ||!limit)return -EINVAL ; +if (power_type !=PP_PWR_TYPE_SUSTAINED ) +return -EOPNOTSUPP ; +mutex_lock (&hwmgr->smu_lock); -if (default_limit) { - *limit = hwmgr->default_power_limit; -if (max_limit) { - *max_limit = *limit; +switch (pp_limit_level) { +case PP_PWR_LIMIT_CURRENT : + *limit = hwmgr->power_limit; +break ; +case PP_PWR_LIMIT_DEFAULT : + *limit = hwmgr->default_power_limit; +break ; +case PP_PWR_LIMIT_MAX : + *limit = hwmgr->default_power_limit;if (hwmgr->od_enabled) { - *max_limit *= (100 + hwmgr->platform_descriptor.TDPODLimit); - *max_limit /=100 ; + *limit *= (100 + hwmgr->platform_descriptor.TDPODLimit); + *limit /=100 ; } - } +break ; +default : + ret = -EOPNOTSUPP ; +break ; } -else - *limit = hwmgr->power_limit;mutex_unlock (&hwmgr->smu_lock); -return 0 ; +return ret; } static int pp_display_configuration_change(void *handle,
Signature · 6 lines
2.31.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH v3 4/6 amdgpu/pm: modify and add smu_get_power_limit to Powerplay API
In reply to Darren Powell modify args of smu_get_power_limit to match Powerplay API .get_power_limit add smu_get_power_limit to Powerplay API swsmu_pm_funcs
remove special handling of smu in amdgpu_hwmon_show_power_cap*
* Test
AMDGPU_PCI_ADDR=lspci -nn | grep "VGA\|Display" | cut -d " " -f 1 AMDGPU_HWMON=ls -la /sys/class/hwmon | grep $AMDGPU_PCI_ADDR | cut -d " " -f 11 HWMON_DIR=/sys/class/hwmon/${AMDGPU_HWMON}
lspci -nn | grep "VGA\|Display" ; \
echo "=== power1 cap ===" ; cat $HWMON_DIR/power1_cap ; \
echo "=== power1 cap max ===" ; cat $HWMON_DIR/power1_cap_max ; \
echo "=== power1 cap def ===" ; cat $HWMON_DIR/power1_cap_default
--- drivers/gpu/drm/amd/pm/amdgpu_pm.c | 18 +++--------------- drivers/gpu/drm/amd/pm/inc/amdgpu_smu.h | 2 +- drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c | 4 +++- 3 files changed, 7 insertions(+), 17 deletions(-)
drivers/gpu/drm/amd/pm/amdgpu_pm.c +3 -15
@@ -2924,11 +2924,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, - pp_limit_level, power_type); - size =snprintf (buf,PAGE_SIZE ,"%u\n" , limit *1000000 ); - }else if (pp_funcs && pp_funcs->get_power_limit) { +if (pp_funcs && pp_funcs->get_power_limit) { pp_funcs->get_power_limit (adev->powerplay.pp_handle, &limit, pp_limit_level, power_type); size =snprintf (buf,PAGE_SIZE ,"%u\n" , limit *1000000 );
@@ -2965,11 +2961,7 @@ 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, - pp_limit_level, power_type); - size =snprintf (buf,PAGE_SIZE ,"%u\n" , limit *1000000 ); - }else if (pp_funcs && pp_funcs->get_power_limit) { +if (pp_funcs && pp_funcs->get_power_limit) { pp_funcs->get_power_limit (adev->powerplay.pp_handle, &limit, pp_limit_level, power_type); size =snprintf (buf,PAGE_SIZE ,"%u\n" , limit *1000000 );
@@ -3006,11 +2998,7 @@ static ssize_t amdgpu_hwmon_show_power_cap_default(struct device *dev,return r; } -if (is_support_sw_smu (adev)) { -smu_get_power_limit (&adev->smu, &limit, - pp_limit_level, power_type); - size =snprintf (buf,PAGE_SIZE ,"%u\n" , limit *1000000 ); - }else if (pp_funcs && pp_funcs->get_power_limit) { +if (pp_funcs && pp_funcs->get_power_limit) { pp_funcs->get_power_limit (adev->powerplay.pp_handle, &limit, pp_limit_level, power_type); size =snprintf (buf,PAGE_SIZE ,"%u\n" , limit *1000000 );
drivers/gpu/drm/amd/pm/inc/amdgpu_smu.h +1 -1
@@ -1262,7 +1262,7 @@ enum smu_cmn2asic_mapping_type { [profile] = {1, (workload)}#if !defined(SWSMU_CODE_LAYER_L2 ) && !defined(SWSMU_CODE_LAYER_L3 ) && !defined(SWSMU_CODE_LAYER_L4 ) -int smu_get_power_limit (struct smu_context *smu, +int smu_get_power_limit (void *handle,uint32_t *limit,enum pp_power_limit_level pp_limit_level,enum pp_power_type pp_power_type);
drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c +3 -1
@@ -2173,11 +2173,12 @@ static int smu_set_fan_speed_rpm(void *handle, uint32_t speed)return ret; } -int smu_get_power_limit (struct smu_context *smu, +int smu_get_power_limit (void *handle,uint32_t *limit,enum pp_power_limit_level pp_limit_level,enum pp_power_type pp_power_type) { +struct smu_context *smu = handle;enum smu_ppt_limit_level limit_level;uint32_t limit_type;int ret =0 ;
@@ -3016,6 +3017,7 @@ static const struct amd_pm_funcs swsmu_pm_funcs = { .load_firmware = smu_load_microcode, .set_powergating_by_smu = smu_dpm_set_power_gate, .set_power_limit = smu_set_power_limit, + .get_power_limit = smu_get_power_limit, .get_power_profile_mode = smu_get_power_profile_mode, .set_power_profile_mode = smu_set_power_profile_mode, .odn_edit_dpm_table = smu_od_edit_dpm_table,
Signature · 6 lines
2.31.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH v3 5/6 amdgpu/pm: handle return value for get_power_limit
In reply to Darren Powell--- drivers/gpu/drm/amd/pm/amdgpu_pm.c | 39 ++++++++++++++++++------------ 1 file changed, 24 insertions(+), 15 deletions(-)
drivers/gpu/drm/amd/pm/amdgpu_pm.c +24 -15
@@ -2924,13 +2924,16 @@ static ssize_t amdgpu_hwmon_show_power_cap_max(struct device *dev,return r; } -if (pp_funcs && pp_funcs->get_power_limit) { - pp_funcs->get_power_limit (adev->powerplay.pp_handle, &limit, - pp_limit_level, power_type); +if (pp_funcs && pp_funcs->get_power_limit) + r = pp_funcs->get_power_limit (adev->powerplay.pp_handle, &limit, + pp_limit_level, power_type); +else + r = -ENODATA ; + +if (!r) size =snprintf (buf,PAGE_SIZE ,"%u\n" , limit *1000000 ); - }else { +else size =snprintf (buf,PAGE_SIZE ,"\n" ); - }pm_runtime_mark_last_busy (adev_to_drm (adev)->dev);pm_runtime_put_autosuspend (adev_to_drm (adev)->dev);
@@ -2961,13 +2964,16 @@ static ssize_t amdgpu_hwmon_show_power_cap(struct device *dev,return r; } -if (pp_funcs && pp_funcs->get_power_limit) { - pp_funcs->get_power_limit (adev->powerplay.pp_handle, &limit, - pp_limit_level, power_type); +if (pp_funcs && pp_funcs->get_power_limit) + r = pp_funcs->get_power_limit (adev->powerplay.pp_handle, &limit, + pp_limit_level, power_type); +else + r = -ENODATA ; + +if (!r) size =snprintf (buf,PAGE_SIZE ,"%u\n" , limit *1000000 ); - }else { +else size =snprintf (buf,PAGE_SIZE ,"\n" ); - }pm_runtime_mark_last_busy (adev_to_drm (adev)->dev);pm_runtime_put_autosuspend (adev_to_drm (adev)->dev);
@@ -2998,13 +3004,16 @@ static ssize_t amdgpu_hwmon_show_power_cap_default(struct device *dev,return r; } -if (pp_funcs && pp_funcs->get_power_limit) { - pp_funcs->get_power_limit (adev->powerplay.pp_handle, &limit, - pp_limit_level, power_type); +if (pp_funcs && pp_funcs->get_power_limit) + r = pp_funcs->get_power_limit (adev->powerplay.pp_handle, &limit, + pp_limit_level, power_type); +else + r = -ENODATA ; + +if (!r) size =snprintf (buf,PAGE_SIZE ,"%u\n" , limit *1000000 ); - }else { +else size =snprintf (buf,PAGE_SIZE ,"\n" ); - }pm_runtime_mark_last_busy (adev_to_drm (adev)->dev);pm_runtime_put_autosuspend (adev_to_drm (adev)->dev);
Signature · 6 lines
2.31.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH v3 6/6 amdgpu/pm: add kernel documentation for smu_get_power_limit
In reply to Darren Powell added doc tag "amdgpu_pp_power" with description added tags for enums pp_power_limit_level, pp_power_type added tag for function smu_get_power_limit
Test:
* Temporary insertion into Documentation/gpu/amdgpu.rst ------------START------------
Power Limit
-----------
.. kernel-doc:: drivers/gpu/drm/amd/include/kgd_pp_interface.h
:doc: amdgpu_pp_power
.. kernel-doc:: drivers/gpu/drm/amd/include/kgd_pp_interface.h
:identifiers: pp_power_limit_level
.. kernel-doc:: drivers/gpu/drm/amd/include/kgd_pp_interface.h
:identifiers: pp_power_type
.. kernel-doc:: drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c
:identifiers: smu_get_power_limit
-------------END-------------
--- .../gpu/drm/amd/include/kgd_pp_interface.h | 28 +++++++++++++++++++ drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c | 10 +++++++ 2 files changed, 38 insertions(+)
drivers/gpu/drm/amd/include/kgd_pp_interface.h +28 -0
@@ -194,6 +194,26 @@ enum pp_df_cstate { DF_CSTATE_ALLOW, }; +/** +* DOC: amdgpu_pp_power +* +* APU power is managed to system-level requirements through the PPT +* (package power tracking) feature. PPT is intended to limit power to the +* requirements of the power source and could be dynamically updated to +* maximize APU performance within the system power budget. +* +* Two types of power measurement can be requested, where supported, with +* :c:type:`enum pp_power_type <pp_power_type>`. +*/ + +/** +* enum pp_power_limit_level - Used to query the power limits +* +* @PP_PWR_LIMIT_MIN: Minimum Power Limit +* @PP_PWR_LIMIT_CURRENT: Current Power Limit +* @PP_PWR_LIMIT_DEFAULT: Default Power Limit +* @PP_PWR_LIMIT_MAX: Maximum Power Limit +*/ enum pp_power_limit_level {PP_PWR_LIMIT_MIN =-1 ,
@@ -202,6 +222,14 @@ enum pp_power_limit_level PP_PWR_LIMIT_MAX, }; +/** +* enum pp_power_type - Used to specify the type of the requested power +* +* @PP_PWR_TYPE_SUSTAINED: manages the configurable, thermally significant +* moving average of APU power (default ~5000 ms). +* @PP_PWR_TYPE_FAST: manages the ~10 ms moving average of APU power, +* where supported. +*/ enum pp_power_type {PP_PWR_TYPE_SUSTAINED ,
drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c +10 -0
@@ -2173,6 +2173,16 @@ static int smu_set_fan_speed_rpm(void *handle, uint32_t speed)return ret; } +/** +* smu_get_power_limit - Request one of the SMU Power Limits +* +* @handle: pointer to smu context +* @limit: requested limit is written back to this variable +* @pp_limit_level: &pp_power_limit_level which limit of the power to return +* @pp_power_type: &pp_power_type type of power +* Return: 0 on success, <0 on error +* +*/ int smu_get_power_limit(void *handle, uint32_t *limit, enum pp_power_limit_level pp_limit_level,
Signature · 6 lines
2.31.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
[Public]
Series is
-----Original Message-----
From: Powell, Darren <[email protected]>
Sent: Sunday, June 6, 2021 10:30 AM
To: [email protected]
Cc: Powell, Darren <[email protected]>
Subject: [PATCH v3 0/6] Modify smu_get_power_limit to implement Powerplay API
=== Description ===
modify smu_get_power_limit to implement Powerplay API
v3: renamed enum pp_power_sample_window to enum pp_power_limit
v2: rewrote the patchset to use two enums as args to get_power
=== Test System ===
* DESKTOP(AMD FX-8350 + NAVI10(731F/ca), BIOS: F2) + ISO(Ubuntu 20.04.1 LTS) + Kernel(5.11.0-custom-fdoagd5f)
=== Patch Summary ===
linux: ([email protected]:agd5f) origin/amd-staging-drm-next @ 3ac16cf10525
+ 1a7ee0a2bc79 amdgpu/pm: reorder definition of swsmu_pm_funcs for readability
+ 3d0481caced7 amdgpu/pm: clean up smu_get_power_limit function signature
+ 593d896cf90c amdgpu/pm: modify Powerplay API get_power_limit to use new pp_power enums
+ 45339b7190fc amdgpu/pm: modify and add smu_get_power_limit to Powerplay API
+ 8f4be6d2a9df amdgpu/pm: handle return value for get_power_limit
+ a2e5f8ecd04f amdgpu/pm: add kernel documentation for smu_get_power_limit
=== Tests ===
==== get_power_limit Test ====
* Test
AMDGPU_PCI_ADDR=lspci -nn | grep "VGA\|Display" | cut -d " " -f 1 AMDGPU_HWMON=ls -la /sys/class/hwmon | grep $AMDGPU_PCI_ADDR | cut -d " " -f 11 HWMON_DIR=/sys/class/hwmon/${AMDGPU_HWMON}
lspci -nn | grep "VGA\|Display" ; \
echo "=== power1 cap ===" ; cat $HWMON_DIR/power1_cap ; \
echo "=== power1 cap max ===" ; cat $HWMON_DIR/power1_cap_max ; \
echo "=== power1 cap def ===" ; cat $HWMON_DIR/power1_cap_default
==== Documentation Test ====
* Insert temp documentation
** Documentation/gpu/amdgpu.rst
vi Documentation/gpu/amdgpu.rst
** added text to start
------------START------------
Documentation Testing
=====================
Power Limit
-----------
.. kernel-doc:: drivers/gpu/drm/amd/include/kgd_pp_interface.h
:doc: amdgpu_pp_power
.. kernel-doc:: drivers/gpu/drm/amd/include/kgd_pp_interface.h
:identifiers: pp_power_limit_level
.. kernel-doc:: drivers/gpu/drm/amd/include/kgd_pp_interface.h
:identifiers: pp_power_type
.. kernel-doc:: drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c
:identifiers: smu_get_power_limit
-------------END-------------
* Setup
cd ~/workspace/linux
. sphinx_2.4.4/bin/activate
* Build
export SPHINXDOCLOG=sphinx.build.log
cp $SPHINXDOCLOG{,.old}
time make -j 8 htmldocs |& tee $SPHINXDOCLOG
* View
firefox file:///home/dapowell/workspace/linux/Documentation/output/gpu/amdgpu.html
Darren Powell (6):
amdgpu/pm: reorder definition of swsmu_pm_funcs for readability amdgpu/pm: clean up smu_get_power_limit function signature amdgpu/pm: modify Powerplay API get_power_limit to use new pp_power
enums
amdgpu/pm: modify and add smu_get_power_limit to Powerplay API amdgpu/pm: handle return value for get_power_limit amdgpu/pm: add kernel documentation for smu_get_power_limit
.../gpu/drm/amd/include/kgd_pp_interface.h | 47 ++++++++- drivers/gpu/drm/amd/pm/amdgpu_pm.c | 64 +++++++------ drivers/gpu/drm/amd/pm/inc/amdgpu_smu.h | 5 +- .../gpu/drm/amd/pm/powerplay/amd_powerplay.c | 33 ++++--- drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c | 96 +++++++++++++------ 5 files changed, 172 insertions(+), 73 deletions(-)
base-commit: f60839821f77d6db48bfc986e0391b70b31fede8 --
2.31.1
_______________________________________________
amd-gfx mailing list [email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx