amdgpu/pm: replaced snprintf usage in amdgpu_pm.c with sysfs_emit
Subsystems (3)
PATCH 1/1 amdgpu/pm: replaced snprintf usage in amdgpu_pm.c with sysfs_emit
replaced snprintf usage in amdgpu_pm.c with sysfs_emit
fixed warning on comparing int with uint32_t in amdgpu_get_pp_num_states()
== 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 10 HWMON_DIR=/sys/class/hwmon/${AMDGPU_HWMON}
lspci -nn | grep "VGA\|Display" > scnprintf.test.log FILES="pp_num_statespp_od_clk_voltagepp_featurespp_dpm_sclkpp_dpm_mclkpp_dpm_socclkpp_dpm_fclkpp_dpm_vclkpp_dpm_dclkpp_dpm_dcefclkpp_power_profile_mode "
for f in $FILES
do
echo === $f === >> scnprintf.test.log
cat $HWMON_DIR/device/$f >> scnprintf.test.log
done
--- drivers/gpu/drm/amd/pm/amdgpu_pm.c | 27 ++++++++++++++------------- 1 file changed, 14 insertions(+), 13 deletions(-)
drivers/gpu/drm/amd/pm/amdgpu_pm.c +14 -13
@@ -411,7 +411,8 @@ static ssize_t amdgpu_get_pp_num_states(struct device *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; +uint32_t i; +int buf_len, ret;if (amdgpu_in_reset (adev))return -EPERM ;
@@ -433,9 +434,9 @@ static ssize_t amdgpu_get_pp_num_states(struct device *dev,pm_runtime_mark_last_busy (ddev->dev);pm_runtime_put_autosuspend (ddev->dev); - buf_len =snprintf (buf,PAGE_SIZE ,"states: %d\n" , data.nums); + buf_len =sysfs_emit (buf,"states: %d\n" , data.nums);for (i =0 ; i < data.nums; i++) - buf_len +=snprintf (buf + buf_len,PAGE_SIZE ,"%d %s\n" , i, + buf_len +=sysfs_emit_at (buf, buf_len,"%d %s\n" , i, (data.states[i] ==POWER_STATE_TYPE_INTERNAL_BOOT ) ?"boot" : (data.states[i] ==POWER_STATE_TYPE_BATTERY ) ?"battery" : (data.states[i] == POWER_STATE_TYPE_BALANCED) ? "balanced" :
@@ -923,7 +924,7 @@ static ssize_t amdgpu_get_pp_od_clk_voltage(struct device *dev, size +=amdgpu_dpm_print_clock_levels (adev,OD_RANGE , buf+size); size +=amdgpu_dpm_print_clock_levels (adev,OD_CCLK , buf+size); }else { - size =snprintf (buf,PAGE_SIZE ,"\n" ); + size =sysfs_emit (buf,"\n" ); }pm_runtime_mark_last_busy (ddev->dev);pm_runtime_put_autosuspend (ddev->dev);
@@ -1009,7 +1010,7 @@ static ssize_t amdgpu_get_pp_features(struct device *dev,if (adev->powerplay.pp_funcs->get_ppfeature_status) size =amdgpu_dpm_get_ppfeature_status (adev, buf);else - size =snprintf (buf,PAGE_SIZE ,"\n" ); + size =sysfs_emit (buf,"\n" );pm_runtime_mark_last_busy (ddev->dev);pm_runtime_put_autosuspend (ddev->dev);
@@ -1070,7 +1071,7 @@ static ssize_t amdgpu_get_pp_dpm_clock(struct device *dev,if (adev->powerplay.pp_funcs->print_clock_levels) size =amdgpu_dpm_print_clock_levels (adev, type, buf);else - size =snprintf (buf,PAGE_SIZE ,"\n" ); + size =sysfs_emit (buf,"\n" );pm_runtime_mark_last_busy (ddev->dev);pm_runtime_put_autosuspend (ddev->dev);
@@ -1469,7 +1470,7 @@ static ssize_t amdgpu_get_pp_power_profile_mode(struct device *dev,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" ); + size =sysfs_emit (buf,"\n" );pm_runtime_mark_last_busy (ddev->dev);pm_runtime_put_autosuspend (ddev->dev);
@@ -2931,9 +2932,9 @@ static ssize_t amdgpu_hwmon_show_power_cap_max(struct device *dev, r = -ENODATA ;if (!r) - size =snprintf (buf,PAGE_SIZE ,"%u\n" , limit *1000000 ); + size =sysfs_emit (buf,"%u\n" , limit *1000000 );else - size =snprintf (buf,PAGE_SIZE ,"\n" ); + size =sysfs_emit (buf,"\n" );pm_runtime_mark_last_busy (adev_to_drm (adev)->dev);pm_runtime_put_autosuspend (adev_to_drm (adev)->dev);
@@ -2971,9 +2972,9 @@ static ssize_t amdgpu_hwmon_show_power_cap(struct device *dev, r = -ENODATA ;if (!r) - size =snprintf (buf,PAGE_SIZE ,"%u\n" , limit *1000000 ); + size =sysfs_emit (buf,"%u\n" , limit *1000000 );else - size =snprintf (buf,PAGE_SIZE ,"\n" ); + size =sysfs_emit (buf,"\n" );pm_runtime_mark_last_busy (adev_to_drm (adev)->dev);pm_runtime_put_autosuspend (adev_to_drm (adev)->dev);
@@ -3011,9 +3012,9 @@ static ssize_t amdgpu_hwmon_show_power_cap_default(struct device *dev, r = -ENODATA ;if (!r) - size =snprintf (buf,PAGE_SIZE ,"%u\n" , limit *1000000 ); + size =sysfs_emit (buf,"%u\n" , limit *1000000 );else - size =snprintf (buf,PAGE_SIZE ,"\n" ); + size =sysfs_emit (buf,"\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
[AMD Official Use Only]
Best Regards,
Kevin
________________________________
From: amd-gfx <[email protected]> on behalf of Darren Powell <[email protected]>
Sent: Wednesday, June 16, 2021 12:31 PM
To: [email protected] <[email protected]>
Cc: Powell, Darren <[email protected]>
Subject: [PATCH] amdgpu/pm: replaced snprintf usage in amdgpu_pm.c with sysfs_emit
replaced snprintf usage in amdgpu_pm.c with sysfs_emit
fixed warning on comparing int with uint32_t in amdgpu_get_pp_num_states()
== 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 10 HWMON_DIR=/sys/class/hwmon/${AMDGPU_HWMON}
lspci -nn | grep "VGA\|Display" > scnprintf.test.log FILES="pp_num_statespp_od_clk_voltagepp_featurespp_dpm_sclkpp_dpm_mclkpp_dpm_socclkpp_dpm_fclkpp_dpm_vclkpp_dpm_dclkpp_dpm_dcefclkpp_power_profile_mode "
for f in $FILES
do
echo === $f === >> scnprintf.test.log
cat $HWMON_DIR/device/$f >> scnprintf.test.log
done
--- drivers/gpu/drm/amd/pm/amdgpu_pm.c | 27 ++++++++++++++------------- 1 file changed, 14 insertions(+), 13 deletions(-)
drivers/gpu/drm/amd/pm/amdgpu_pm.c +14 -13
@@ -411,7 +411,8 @@ static ssize_t amdgpu_get_pp_num_states(struct device *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; +uint32_t i; +int buf_len, ret;if (amdgpu_in_reset (adev))return -EPERM ;
@@ -433,9 +434,9 @@ static ssize_t amdgpu_get_pp_num_states(struct device *dev,pm_runtime_mark_last_busy (ddev->dev);pm_runtime_put_autosuspend (ddev->dev); - buf_len =snprintf (buf,PAGE_SIZE ,"states: %d\n" , data.nums); + buf_len =sysfs_emit (buf,"states: %d\n" , data.nums);for (i =0 ; i < data.nums; i++) - buf_len +=snprintf (buf + buf_len,PAGE_SIZE ,"%d %s\n" , i, + buf_len +=sysfs_emit_at (buf, buf_len,"%d %s\n" , i, (data.states[i] ==POWER_STATE_TYPE_INTERNAL_BOOT ) ?"boot" : (data.states[i] ==POWER_STATE_TYPE_BATTERY ) ?"battery" : (data.states[i] == POWER_STATE_TYPE_BALANCED) ? "balanced" :
@@ -923,7 +924,7 @@ static ssize_t amdgpu_get_pp_od_clk_voltage(struct device *dev, size +=amdgpu_dpm_print_clock_levels (adev,OD_RANGE , buf+size); size +=amdgpu_dpm_print_clock_levels (adev,OD_CCLK , buf+size); }else { - size =snprintf (buf,PAGE_SIZE ,"\n" ); + size =sysfs_emit (buf,"\n" ); }pm_runtime_mark_last_busy (ddev->dev);pm_runtime_put_autosuspend (ddev->dev);
@@ -1009,7 +1010,7 @@ static ssize_t amdgpu_get_pp_features(struct device *dev,if (adev->powerplay.pp_funcs->get_ppfeature_status) size =amdgpu_dpm_get_ppfeature_status (adev, buf);else - size =snprintf (buf,PAGE_SIZE ,"\n" ); + size =sysfs_emit (buf,"\n" );pm_runtime_mark_last_busy (ddev->dev);pm_runtime_put_autosuspend (ddev->dev);
@@ -1070,7 +1071,7 @@ static ssize_t amdgpu_get_pp_dpm_clock(struct device *dev,if (adev->powerplay.pp_funcs->print_clock_levels) size =amdgpu_dpm_print_clock_levels (adev, type, buf);else - size =snprintf (buf,PAGE_SIZE ,"\n" ); + size =sysfs_emit (buf,"\n" );pm_runtime_mark_last_busy (ddev->dev);pm_runtime_put_autosuspend (ddev->dev);
@@ -1469,7 +1470,7 @@ static ssize_t amdgpu_get_pp_power_profile_mode(struct device *dev,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" ); + size =sysfs_emit (buf,"\n" );pm_runtime_mark_last_busy (ddev->dev);pm_runtime_put_autosuspend (ddev->dev);
@@ -2931,9 +2932,9 @@ static ssize_t amdgpu_hwmon_show_power_cap_max(struct device *dev, r = -ENODATA ;if (!r) - size =snprintf (buf,PAGE_SIZE ,"%u\n" , limit *1000000 ); + size =sysfs_emit (buf,"%u\n" , limit *1000000 );else - size =snprintf (buf,PAGE_SIZE ,"\n" ); + size =sysfs_emit (buf,"\n" );pm_runtime_mark_last_busy (adev_to_drm (adev)->dev);pm_runtime_put_autosuspend (adev_to_drm (adev)->dev);
@@ -2971,9 +2972,9 @@ static ssize_t amdgpu_hwmon_show_power_cap(struct device *dev, r = -ENODATA ;if (!r) - size =snprintf (buf,PAGE_SIZE ,"%u\n" , limit *1000000 ); + size =sysfs_emit (buf,"%u\n" , limit *1000000 );else - size =snprintf (buf,PAGE_SIZE ,"\n" ); + size =sysfs_emit (buf,"\n" );pm_runtime_mark_last_busy (adev_to_drm (adev)->dev);pm_runtime_put_autosuspend (adev_to_drm (adev)->dev);
@@ -3011,9 +3012,9 @@ static ssize_t amdgpu_hwmon_show_power_cap_default(struct device *dev, r = -ENODATA ;if (!r) - size =snprintf (buf,PAGE_SIZE ,"%u\n" , limit *1000000 ); + size =sysfs_emit (buf,"%u\n" , limit *1000000 );else - size =snprintf (buf,PAGE_SIZE ,"\n" ); + size =sysfs_emit (buf,"\n" );pm_runtime_mark_last_busy (adev_to_drm (adev)->dev);pm_runtime_put_autosuspend (adev_to_drm (adev)->dev);
--
2.31.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%7Ca4803946245b4521d26e08d9307f9e27%7C3dd8961fe4884e608e11a82d994e183d%7C0%7C0%7C637594146951324361%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C1000&sdata=FgYkesFOLYQAfD2ZS6KFFO3soJm8Xutyv6nrJLivx%2Bw%3D&reserved=0
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx