drm/amdgpu/swsmu/navi1x: simplify sensor handling
Subsystems (3)
PATCH 1/3 drm/amdgpu/swsmu/navi1x: simplify sensor handling
Just query the metrics table directly rather than going through an extra level of functions.
--- .../gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c | 98 +++++-------------- 1 file changed, 24 insertions(+), 74 deletions(-)
drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c +24 -74
@@ -1302,44 +1302,6 @@ static int navi10_display_config_changed(struct smu_context *smu)return ret; } -static int navi10_get_gpu_power (struct smu_context *smu,uint32_t *value) -{ -if (!value) -return -EINVAL ; - -return navi10_get_smu_metrics_data (smu, -METRICS_AVERAGE_SOCKETPOWER , - value); -} - -static int navi10_get_current_activity_percent (struct smu_context *smu, -enum amd_pp_sensors sensor, -uint32_t *value) -{ -int ret =0 ; - -if (!value) -return -EINVAL ; - -switch (sensor) { -case AMDGPU_PP_SENSOR_GPU_LOAD : - ret =navi10_get_smu_metrics_data (smu, -METRICS_AVERAGE_GFXACTIVITY , - value); -break ; -case AMDGPU_PP_SENSOR_MEM_LOAD : - ret =navi10_get_smu_metrics_data (smu, -METRICS_AVERAGE_MEMACTIVITY , - value); -break ; -default : -dev_err (smu->adev->dev,"Invalid sensor for retrieving clock activity\n" ); -return -EINVAL ; - } - -return ret; -} -static bool navi10_is_dpm_running (struct smu_context *smu) {int ret =0 ;
@@ -1652,39 +1614,6 @@ static int navi10_set_watermarks_table(struct smu_context *smu,return 0 ; } -static int navi10_thermal_get_temperature (struct smu_context *smu, -enum amd_pp_sensors sensor, -uint32_t *value) -{ -int ret =0 ; - -if (!value) -return -EINVAL ; - -switch (sensor) { -case AMDGPU_PP_SENSOR_HOTSPOT_TEMP : - ret =navi10_get_smu_metrics_data (smu, -METRICS_TEMPERATURE_HOTSPOT , - value); -break ; -case AMDGPU_PP_SENSOR_EDGE_TEMP : - ret =navi10_get_smu_metrics_data (smu, -METRICS_TEMPERATURE_EDGE , - value); -break ; -case AMDGPU_PP_SENSOR_MEM_TEMP : - ret =navi10_get_smu_metrics_data (smu, -METRICS_TEMPERATURE_MEM , - value); -break ; -default : -dev_err (smu->adev->dev,"Invalid sensor for retrieving temp\n" ); -return -EINVAL ; - } - -return ret; -} -static int navi10_read_sensor (struct smu_context *smu,enum amd_pp_sensors sensor,void *data,uint32_t *size)
@@ -1703,18 +1632,39 @@ static int navi10_read_sensor(struct smu_context *smu, *size =4 ;break ;case AMDGPU_PP_SENSOR_MEM_LOAD : + ret =navi10_get_smu_metrics_data (smu, +METRICS_AVERAGE_MEMACTIVITY , + (uint32_t *)data); + *size =4 ; +break ;case AMDGPU_PP_SENSOR_GPU_LOAD : - ret =navi10_get_current_activity_percent (smu, sensor, (uint32_t *)data); + ret =navi10_get_smu_metrics_data (smu, +METRICS_AVERAGE_GFXACTIVITY , + (uint32_t *)data); *size =4 ;break ;case AMDGPU_PP_SENSOR_GPU_POWER : - ret =navi10_get_gpu_power (smu, (uint32_t *)data); + ret =navi10_get_smu_metrics_data (smu, +METRICS_AVERAGE_SOCKETPOWER , + (uint32_t *)data); *size =4 ;break ;case AMDGPU_PP_SENSOR_HOTSPOT_TEMP : + ret =navi10_get_smu_metrics_data (smu, +METRICS_TEMPERATURE_HOTSPOT , + (uint32_t *)data); + *size =4 ; +break ;case AMDGPU_PP_SENSOR_EDGE_TEMP : + ret =navi10_get_smu_metrics_data (smu, +METRICS_TEMPERATURE_EDGE , + (uint32_t *)data); + *size =4 ; +break ;case AMDGPU_PP_SENSOR_MEM_TEMP : - ret =navi10_thermal_get_temperature (smu, sensor, (uint32_t *)data); + ret =navi10_get_smu_metrics_data (smu, +METRICS_TEMPERATURE_MEM , + (uint32_t *)data); *size =4 ;break ;case AMDGPU_PP_SENSOR_GFX_MCLK :
Signature · 6 lines
2.25.4 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 2/3 drm/amdgpu/swsmu/arcturus: simplify sensor handling
Just query the metrics table directly rather than going through an extra level of functions.
--- .../gpu/drm/amd/pm/swsmu/smu11/arcturus_ppt.c | 101 +++++------------- 1 file changed, 24 insertions(+), 77 deletions(-)
drivers/gpu/drm/amd/pm/swsmu/smu11/arcturus_ppt.c +24 -77
@@ -1000,77 +1000,6 @@ static int arcturus_get_thermal_temperature_range(struct smu_context *smu,return 0 ; } -static int arcturus_get_current_activity_percent (struct smu_context *smu, -enum amd_pp_sensors sensor, -uint32_t *value) -{ -int ret =0 ; - -if (!value) -return -EINVAL ; - -switch (sensor) { -case AMDGPU_PP_SENSOR_GPU_LOAD : - ret =arcturus_get_smu_metrics_data (smu, -METRICS_AVERAGE_GFXACTIVITY , - value); -break ; -case AMDGPU_PP_SENSOR_MEM_LOAD : - ret =arcturus_get_smu_metrics_data (smu, -METRICS_AVERAGE_MEMACTIVITY , - value); -break ; -default : -dev_err (smu->adev->dev,"Invalid sensor for retrieving clock activity\n" ); -return -EINVAL ; - } - -return ret; -} - -static int arcturus_get_gpu_power (struct smu_context *smu,uint32_t *value) -{ -if (!value) -return -EINVAL ; - -return arcturus_get_smu_metrics_data (smu, -METRICS_AVERAGE_SOCKETPOWER , - value); -} - -static int arcturus_thermal_get_temperature (struct smu_context *smu, -enum amd_pp_sensors sensor, -uint32_t *value) -{ -int ret =0 ; - -if (!value) -return -EINVAL ; - -switch (sensor) { -case AMDGPU_PP_SENSOR_HOTSPOT_TEMP : - ret =arcturus_get_smu_metrics_data (smu, -METRICS_TEMPERATURE_HOTSPOT , - value); -break ; -case AMDGPU_PP_SENSOR_EDGE_TEMP : - ret =arcturus_get_smu_metrics_data (smu, -METRICS_TEMPERATURE_EDGE , - value); -break ; -case AMDGPU_PP_SENSOR_MEM_TEMP : - ret =arcturus_get_smu_metrics_data (smu, -METRICS_TEMPERATURE_MEM , - value); -break ; -default : -dev_err (smu->adev->dev,"Invalid sensor for retrieving temp\n" ); -return -EINVAL ; - } - -return ret; -} -static int arcturus_read_sensor (struct smu_context *smu,enum amd_pp_sensors sensor,void *data,uint32_t *size)
@@ -1092,21 +1021,39 @@ static int arcturus_read_sensor(struct smu_context *smu, *size =4 ;break ;case AMDGPU_PP_SENSOR_MEM_LOAD : + ret =arcturus_get_smu_metrics_data (smu, +METRICS_AVERAGE_MEMACTIVITY , + (uint32_t *)data); + *size =4 ; +break ;case AMDGPU_PP_SENSOR_GPU_LOAD : - ret =arcturus_get_current_activity_percent (smu, - sensor, - (uint32_t *)data); + ret =arcturus_get_smu_metrics_data (smu, +METRICS_AVERAGE_GFXACTIVITY , + (uint32_t *)data); *size =4 ;break ;case AMDGPU_PP_SENSOR_GPU_POWER : - ret =arcturus_get_gpu_power (smu, (uint32_t *)data); + ret =arcturus_get_smu_metrics_data (smu, +METRICS_AVERAGE_SOCKETPOWER , + (uint32_t *)data); *size =4 ;break ;case AMDGPU_PP_SENSOR_HOTSPOT_TEMP : + ret =arcturus_get_smu_metrics_data (smu, +METRICS_TEMPERATURE_HOTSPOT , + (uint32_t *)data); + *size =4 ; +break ;case AMDGPU_PP_SENSOR_EDGE_TEMP : + ret =arcturus_get_smu_metrics_data (smu, +METRICS_TEMPERATURE_EDGE , + (uint32_t *)data); + *size =4 ; +break ;case AMDGPU_PP_SENSOR_MEM_TEMP : - ret =arcturus_thermal_get_temperature (smu, sensor, - (uint32_t *)data); + ret =arcturus_get_smu_metrics_data (smu, +METRICS_TEMPERATURE_MEM , + (uint32_t *)data); *size =4 ;break ;case AMDGPU_PP_SENSOR_GFX_MCLK :
Signature · 6 lines
2.25.4 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 3/3 drm/amdgpu/swsmu/sienna_cichlid: simplify sensor handling
In reply to Alex DeucherJust query the metrics table directly rather than going through an extra level of functions.
--- .../amd/pm/swsmu/smu11/sienna_cichlid_ppt.c | 98 +++++-------------- 1 file changed, 24 insertions(+), 74 deletions(-)
drivers/gpu/drm/amd/pm/swsmu/smu11/sienna_cichlid_ppt.c +24 -74
@@ -1119,44 +1119,6 @@ static int sienna_cichlid_display_config_changed(struct smu_context *smu)return ret; } -static int sienna_cichlid_get_gpu_power (struct smu_context *smu,uint32_t *value) -{ -if (!value) -return -EINVAL ; - -return sienna_cichlid_get_smu_metrics_data (smu, -METRICS_AVERAGE_SOCKETPOWER , - value); -} - -static int sienna_cichlid_get_current_activity_percent (struct smu_context *smu, -enum amd_pp_sensors sensor, -uint32_t *value) -{ -int ret =0 ; - -if (!value) -return -EINVAL ; - -switch (sensor) { -case AMDGPU_PP_SENSOR_GPU_LOAD : - ret =sienna_cichlid_get_smu_metrics_data (smu, -METRICS_AVERAGE_GFXACTIVITY , - value); -break ; -case AMDGPU_PP_SENSOR_MEM_LOAD : - ret =sienna_cichlid_get_smu_metrics_data (smu, -METRICS_AVERAGE_MEMACTIVITY , - value); -break ; -default : -dev_err (smu->adev->dev,"Invalid sensor for retrieving clock activity\n" ); -return -EINVAL ; - } - -return ret; -} -static bool sienna_cichlid_is_dpm_running (struct smu_context *smu) {int ret =0 ;
@@ -1468,39 +1430,6 @@ static int sienna_cichlid_set_watermarks_table(struct smu_context *smu,return 0 ; } -static int sienna_cichlid_thermal_get_temperature (struct smu_context *smu, -enum amd_pp_sensors sensor, -uint32_t *value) -{ -int ret =0 ; - -if (!value) -return -EINVAL ; - -switch (sensor) { -case AMDGPU_PP_SENSOR_HOTSPOT_TEMP : - ret =sienna_cichlid_get_smu_metrics_data (smu, -METRICS_TEMPERATURE_HOTSPOT , - value); -break ; -case AMDGPU_PP_SENSOR_EDGE_TEMP : - ret =sienna_cichlid_get_smu_metrics_data (smu, -METRICS_TEMPERATURE_EDGE , - value); -break ; -case AMDGPU_PP_SENSOR_MEM_TEMP : - ret =sienna_cichlid_get_smu_metrics_data (smu, -METRICS_TEMPERATURE_MEM , - value); -break ; -default : -dev_err (smu->adev->dev,"Invalid sensor for retrieving temp\n" ); -return -EINVAL ; - } - -return ret; -} -static int sienna_cichlid_read_sensor (struct smu_context *smu,enum amd_pp_sensors sensor,void *data,uint32_t *size)
@@ -1519,18 +1448,39 @@ static int sienna_cichlid_read_sensor(struct smu_context *smu, *size =4 ;break ;case AMDGPU_PP_SENSOR_MEM_LOAD : + ret =sienna_cichlid_get_smu_metrics_data (smu, +METRICS_AVERAGE_MEMACTIVITY , + (uint32_t *)data); + *size =4 ; +break ;case AMDGPU_PP_SENSOR_GPU_LOAD : - ret =sienna_cichlid_get_current_activity_percent (smu, sensor, (uint32_t *)data); + ret =sienna_cichlid_get_smu_metrics_data (smu, +METRICS_AVERAGE_GFXACTIVITY , + (uint32_t *)data); *size =4 ;break ;case AMDGPU_PP_SENSOR_GPU_POWER : - ret =sienna_cichlid_get_gpu_power (smu, (uint32_t *)data); + ret =sienna_cichlid_get_smu_metrics_data (smu, +METRICS_AVERAGE_SOCKETPOWER , + (uint32_t *)data); *size =4 ;break ;case AMDGPU_PP_SENSOR_HOTSPOT_TEMP : + ret =sienna_cichlid_get_smu_metrics_data (smu, +METRICS_TEMPERATURE_HOTSPOT , + (uint32_t *)data); + *size =4 ; +break ;case AMDGPU_PP_SENSOR_EDGE_TEMP : + ret =sienna_cichlid_get_smu_metrics_data (smu, +METRICS_TEMPERATURE_EDGE , + (uint32_t *)data); + *size =4 ; +break ;case AMDGPU_PP_SENSOR_MEM_TEMP : - ret =sienna_cichlid_thermal_get_temperature (smu, sensor, (uint32_t *)data); + ret =sienna_cichlid_get_smu_metrics_data (smu, +METRICS_TEMPERATURE_MEM , + (uint32_t *)data); *size =4 ;break ;case AMDGPU_PP_SENSOR_GFX_MCLK :
Signature · 6 lines
2.25.4 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
RE: [PATCH 3/3] drm/amdgpu/swsmu/sienna_cichlid: simplify sensor handling
[AMD Official Use Only - Internal Distribution Only]
Series is reviewed-by: Evan Quan <[email protected]>
-----Original Message-----
From: amd-gfx <[email protected]> On Behalf Of Alex Deucher
Sent: Wednesday, December 2, 2020 2:43 AM
To: [email protected]
Cc: Deucher, Alexander <[email protected]>
Subject: [PATCH 3/3] drm/amdgpu/swsmu/sienna_cichlid: simplify sensor handling
Just query the metrics table directly rather than going through an extra level of functions.
--- .../amd/pm/swsmu/smu11/sienna_cichlid_ppt.c | 98 +++++-------------- 1 file changed, 24 insertions(+), 74 deletions(-)
drivers/gpu/drm/amd/pm/swsmu/smu11/sienna_cichlid_ppt.c +24 -73
@@ -1119,44 +1119,6 @@ static int sienna_cichlid_display_config_changed(struct smu_context *smu)return ret; } -static int sienna_cichlid_get_gpu_power(struct smu_context *smu, uint32_t *value) -{ -if (!value) -return -EINVAL ; - -return sienna_cichlid_get_smu_metrics_data (smu, -METRICS_AVERAGE_SOCKETPOWER , - value); -} - -static int sienna_cichlid_get_current_activity_percent (struct smu_context *smu, -enum amd_pp_sensors sensor, -uint32_t *value) -{ -int ret =0 ; - -if (!value) -return -EINVAL ; - -switch (sensor) { -case AMDGPU_PP_SENSOR_GPU_LOAD : -ret =sienna_cichlid_get_smu_metrics_data (smu, -METRICS_AVERAGE_GFXACTIVITY , - value); -break ; -case AMDGPU_PP_SENSOR_MEM_LOAD : -ret =sienna_cichlid_get_smu_metrics_data (smu, -METRICS_AVERAGE_MEMACTIVITY , - value); -break ; -default : -dev_err (smu->adev->dev,"Invalid sensor for retrieving clock activity\n" ); -return -EINVAL ; -} - -return ret; -} -static bool sienna_cichlid_is_dpm_running (struct smu_context *smu) {int ret =0 ;
@@ -1468,39 +1430,6 @@ static int sienna_cichlid_set_watermarks_table(struct smu_context *smu,return 0 ; } -static int sienna_cichlid_thermal_get_temperature (struct smu_context *smu, -enum amd_pp_sensors sensor, -uint32_t *value) -{ -int ret =0 ; - -if (!value) -return -EINVAL ; - -switch (sensor) { -case AMDGPU_PP_SENSOR_HOTSPOT_TEMP : -ret =sienna_cichlid_get_smu_metrics_data (smu, -METRICS_TEMPERATURE_HOTSPOT , - value); -break ; -case AMDGPU_PP_SENSOR_EDGE_TEMP : -ret =sienna_cichlid_get_smu_metrics_data (smu, -METRICS_TEMPERATURE_EDGE , - value); -break ; -case AMDGPU_PP_SENSOR_MEM_TEMP : -ret =sienna_cichlid_get_smu_metrics_data (smu, -METRICS_TEMPERATURE_MEM , - value); -break ; -default : -dev_err (smu->adev->dev,"Invalid sensor for retrieving temp\n" ); -return -EINVAL ; -} - -return ret; -} -static int sienna_cichlid_read_sensor (struct smu_context *smu,enum amd_pp_sensors sensor,void *data,uint32_t *size)
@@ -1519,18 +1448,39 @@ static int sienna_cichlid_read_sensor(struct smu_context *smu, *size =4 ;break ;case AMDGPU_PP_SENSOR_MEM_LOAD : +ret =sienna_cichlid_get_smu_metrics_data (smu, +METRICS_AVERAGE_MEMACTIVITY , + (uint32_t *)data); +*size =4 ; +break ;case AMDGPU_PP_SENSOR_GPU_LOAD : -ret =sienna_cichlid_get_current_activity_percent (smu, sensor, (uint32_t *)data); +ret =sienna_cichlid_get_smu_metrics_data (smu, +METRICS_AVERAGE_GFXACTIVITY , + (uint32_t *)data); *size =4 ;break ;case AMDGPU_PP_SENSOR_GPU_POWER : -ret =sienna_cichlid_get_gpu_power (smu, (uint32_t *)data); +ret =sienna_cichlid_get_smu_metrics_data (smu, +METRICS_AVERAGE_SOCKETPOWER , + (uint32_t *)data); *size =4 ;break ;case AMDGPU_PP_SENSOR_HOTSPOT_TEMP : +ret =sienna_cichlid_get_smu_metrics_data (smu, +METRICS_TEMPERATURE_HOTSPOT , + (uint32_t *)data); +*size =4 ; +break ;case AMDGPU_PP_SENSOR_EDGE_TEMP : +ret =sienna_cichlid_get_smu_metrics_data (smu, +METRICS_TEMPERATURE_EDGE , + (uint32_t *)data); +*size =4 ; +break ;case AMDGPU_PP_SENSOR_MEM_TEMP : -ret =sienna_cichlid_thermal_get_temperature (smu, sensor, (uint32_t *)data); +ret =sienna_cichlid_get_smu_metrics_data (smu, +METRICS_TEMPERATURE_MEM , + (uint32_t *)data); *size =4 ;break ;case AMDGPU_PP_SENSOR_GFX_MCLK :
--
2.25.4
_______________________________________________
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%7Ce93414ccd35e4357db7908d89629003d%7C3dd8961fe4884e608e11a82d994e183d%7C0%7C0%7C637424450123752767%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C1000&sdata=QU9nHZZgdnnkBHOCENfXMjGKBXgmr%2BaDv6QiKG95PdA%3D&reserved=0
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx