drm/amd/powerplay: drop unnecessary SMU_MSG_GetDpmClockFreq check
Subsystems (2)
PATCH 1/3 drm/amd/powerplay: drop unnecessary SMU_MSG_GetDpmClockFreq check
Since SMU_MSG_GetDpmClockFreq is known to be supported for Vega20 and before ASICs only. For those ASICs supporting swSMU, it is not supported.
--- drivers/gpu/drm/amd/powerplay/smu_v11_0.c | 17 +++-------------- 1 file changed, 3 insertions(+), 14 deletions(-)
drivers/gpu/drm/amd/powerplay/smu_v11_0.c +3 -14
@@ -1089,24 +1089,13 @@ int smu_v11_0_get_current_clk_freq(struct smu_context *smu, {int ret =0 ;uint32_t freq =0 ; -int asic_clk_id;if (clk_id >=SMU_CLK_COUNT || !value)return -EINVAL ; - asic_clk_id =smu_clk_get_index (smu, clk_id); -if (asic_clk_id <0 ) -return -EINVAL ; - -/* if don't has GetDpmClockFreq Message, try get current clock by SmuMetrics_t */ -if (smu_msg_get_index (smu, SMU_MSG_GetDpmClockFreq) <0 ) - ret =smu_get_current_clk_freq_by_table (smu, clk_id, &freq); -else { - ret =smu_send_smc_msg_with_param (smu, SMU_MSG_GetDpmClockFreq, - (asic_clk_id <<16 ), &freq); -if (ret) -return ret; - } + ret =smu_get_current_clk_freq_by_table (smu, clk_id, &freq); +if (ret) +return ret; freq *=100 ; *value = freq;
Signature · 6 lines
2.27.0 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 2/3 drm/amd/powerplay: revise the calling chain on sensor reading
Update the calling chain from "amdgpu_smu.c -> ${asic}_ppt.c -> smu_v11/12_0.c -> amdgpu_smu.c (smu_common_read_sensor())" to " "amdgpu_smu.c -> ${asic}_ppt.c -> smu_v11/12_0.c". This can help to maintain clear code layers. More similar changes will be coming.
--- drivers/gpu/drm/amd/powerplay/amdgpu_smu.c | 81 ++++++++----------- .../gpu/drm/amd/powerplay/inc/amdgpu_smu.h | 2 - drivers/gpu/drm/amd/powerplay/smu_v11_0.c | 2 +- drivers/gpu/drm/amd/powerplay/smu_v12_0.c | 2 +- 4 files changed, 35 insertions(+), 52 deletions(-)
drivers/gpu/drm/amd/powerplay/amdgpu_smu.c +33 -48
@@ -506,52 +506,6 @@ int smu_get_power_num_states(struct smu_context *smu,return 0 ; } -int smu_common_read_sensor (struct smu_context *smu,enum amd_pp_sensors sensor, -void *data,uint32_t *size) -{ -struct smu_power_context *smu_power = &smu->smu_power; -struct smu_power_gate *power_gate = &smu_power->power_gate; -int ret =0 ; - -if (!data || !size) -return -EINVAL ; - -switch (sensor) { -case AMDGPU_PP_SENSOR_STABLE_PSTATE_SCLK : - *((uint32_t *)data) = smu->pstate_sclk; - *size =4 ; -break ; -case AMDGPU_PP_SENSOR_STABLE_PSTATE_MCLK : - *((uint32_t *)data) = smu->pstate_mclk; - *size =4 ; -break ; -case AMDGPU_PP_SENSOR_ENABLED_SMC_FEATURES_MASK : - ret =smu_feature_get_enabled_mask (smu, (uint32_t *)data,2 ); - *size =8 ; -break ; -case AMDGPU_PP_SENSOR_UVD_POWER : - *(uint32_t *)data =smu_feature_is_enabled (smu,SMU_FEATURE_DPM_UVD_BIT ) ?1 :0 ; - *size =4 ; -break ; -case AMDGPU_PP_SENSOR_VCE_POWER : - *(uint32_t *)data =smu_feature_is_enabled (smu,SMU_FEATURE_DPM_VCE_BIT ) ?1 :0 ; - *size =4 ; -break ; -case AMDGPU_PP_SENSOR_VCN_POWER_STATE : - *(uint32_t *)data = power_gate->vcn_gated ?0 :1 ; - *size =4 ; -break ; -default : - ret = -EINVAL ; -break ; - } - -if (ret) - *size =0 ; - -return ret; -} -int smu_update_table (struct smu_context *smu,enum smu_table_id table_index,int argument,void *table_data,bool drv2smu) {
@@ -2338,10 +2292,41 @@ int smu_read_sensor(struct smu_context *smu,if (!smu->pm_enabled || !smu->adev->pm.dpm_enabled)return -EOPNOTSUPP ; +if (!data || !size) +return -EINVAL ; +mutex_lock (&smu->mutex); -if (smu->ppt_funcs->read_sensor) - ret = smu->ppt_funcs->read_sensor (smu, sensor, data, size); +switch (sensor) { +case AMDGPU_PP_SENSOR_STABLE_PSTATE_SCLK : + *((uint32_t *)data) = smu->pstate_sclk; + *size =4 ; +break ; +case AMDGPU_PP_SENSOR_STABLE_PSTATE_MCLK : + *((uint32_t *)data) = smu->pstate_mclk; + *size =4 ; +break ; +case AMDGPU_PP_SENSOR_ENABLED_SMC_FEATURES_MASK : + ret =smu_feature_get_enabled_mask (smu, (uint32_t *)data,2 ); + *size =8 ; +break ; +case AMDGPU_PP_SENSOR_UVD_POWER : + *(uint32_t *)data =smu_feature_is_enabled (smu,SMU_FEATURE_DPM_UVD_BIT ) ?1 :0 ; + *size =4 ; +break ; +case AMDGPU_PP_SENSOR_VCE_POWER : + *(uint32_t *)data =smu_feature_is_enabled (smu,SMU_FEATURE_DPM_VCE_BIT ) ?1 :0 ; + *size =4 ; +break ; +case AMDGPU_PP_SENSOR_VCN_POWER_STATE : + *(uint32_t *)data = smu->smu_power.power_gate.vcn_gated ?0 :1 ; + *size =4 ; +break ; +default : +if (smu->ppt_funcs->read_sensor) + ret = smu->ppt_funcs->read_sensor (smu, sensor, data, size); +break ; + }mutex_unlock (&smu->mutex);
drivers/gpu/drm/amd/powerplay/inc/amdgpu_smu.h +0 -2
@@ -695,8 +695,6 @@ int smu_update_table(struct smu_context *smu, enum smu_table_id table_index, intbool is_support_sw_smu (struct amdgpu_device *adev);int smu_reset (struct smu_context *smu); -int smu_common_read_sensor (struct smu_context *smu,enum amd_pp_sensors sensor, -void *data,uint32_t *size);int smu_sys_get_pp_table (struct smu_context *smu,void **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);
drivers/gpu/drm/amd/powerplay/smu_v11_0.c +1 -1
@@ -1198,7 +1198,7 @@ int smu_v11_0_read_sensor(struct smu_context *smu, *size =4 ;break ;default : - ret =smu_common_read_sensor (smu, sensor, data, size); + ret = -EOPNOTSUPP ;break ; }
drivers/gpu/drm/amd/powerplay/smu_v12_0.c +1 -1
@@ -226,7 +226,7 @@ int smu_v12_0_read_sensor(struct smu_context *smu, *size =4 ;break ;default : - ret =smu_common_read_sensor (smu, sensor, data, size); + ret = -EOPNOTSUPP ;break ; }
Signature · 6 lines
2.27.0 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
Re: [PATCH 2/3] drm/amd/powerplay: revise the calling chain on sensor reading
Quoted 8 lines · Evan Quan
Update the calling chain from "
amdgpu_smu.c-> ${asic}_ppt.c -> smu_v11/12_0.c ->amdgpu_smu.c(smu_common_read_sensor())" to " "amdgpu_smu.c-> ${asic}_ppt.c -> smu_v11/12_0.c". This can help to maintain clear code layers. More similar changes will be coming.Change-Id I95beba6c117b0cd3b0acea6158bf62240c6eac5aSigned-off-by Evan Quan <[email protected]>
Quoted 150 lines
--- drivers/gpu/drm/amd/powerplay/amdgpu_smu.c | 81 ++++++++----------- .../gpu/drm/amd/powerplay/inc/amdgpu_smu.h | 2 - drivers/gpu/drm/amd/powerplay/smu_v11_0.c | 2 +- drivers/gpu/drm/amd/powerplay/smu_v12_0.c | 2 +- 4 files changed, 35 insertions(+), 52 deletions(-)drivers/gpu/drm/amd/powerplay/amdgpu_smu.c +33
-48@@ -506,52 +506,6 @@ int smu_get_power_num_states(struct smu_context *smu,return 0 ; } -int smu_common_read_sensor (struct smu_context *smu,enum amd_pp_sensors sensor, -void *data,uint32_t *size) -{ -struct smu_power_context *smu_power = &smu->smu_power; -struct smu_power_gate *power_gate = &smu_power->power_gate; -int ret =0 ; - -if (!data || !size) -return -EINVAL ; - -switch (sensor) { -case AMDGPU_PP_SENSOR_STABLE_PSTATE_SCLK : - *((uint32_t *)data) = smu->pstate_sclk; - *size =4 ; -break ; -case AMDGPU_PP_SENSOR_STABLE_PSTATE_MCLK : - *((uint32_t *)data) = smu->pstate_mclk; - *size =4 ; -break ; -case AMDGPU_PP_SENSOR_ENABLED_SMC_FEATURES_MASK : - ret =smu_feature_get_enabled_mask (smu, (uint32_t *)data,2 ); - *size =8 ; -break ; -case AMDGPU_PP_SENSOR_UVD_POWER : - *(uint32_t *)data =smu_feature_is_enabled (smu,SMU_FEATURE_DPM_UVD_BIT ) ?1 :0 ; - *size =4 ; -break ; -case AMDGPU_PP_SENSOR_VCE_POWER : - *(uint32_t *)data =smu_feature_is_enabled (smu,SMU_FEATURE_DPM_VCE_BIT ) ?1 :0 ; - *size =4 ; -break ; -case AMDGPU_PP_SENSOR_VCN_POWER_STATE : - *(uint32_t *)data = power_gate->vcn_gated ?0 :1 ; - *size =4 ; -break ; -default : - ret = -EINVAL ; -break ; - } - -if (ret) - *size =0 ; - -return ret; -} -int smu_update_table (struct smu_context *smu,enum smu_table_id table_index,int argument,void *table_data,bool drv2smu) {@@ -2338,10 +2292,41 @@ int smu_read_sensor(struct smu_context *smu,if (!smu->pm_enabled || !smu->adev->pm.dpm_enabled)return -EOPNOTSUPP ; +if (!data || !size) +return -EINVAL ; +mutex_lock (&smu->mutex); -if (smu->ppt_funcs->read_sensor) - ret = smu->ppt_funcs->read_sensor (smu, sensor, data, size); +switch (sensor) { +case AMDGPU_PP_SENSOR_STABLE_PSTATE_SCLK : + *((uint32_t *)data) = smu->pstate_sclk; + *size =4 ; +break ; +case AMDGPU_PP_SENSOR_STABLE_PSTATE_MCLK : + *((uint32_t *)data) = smu->pstate_mclk; + *size =4 ; +break ; +case AMDGPU_PP_SENSOR_ENABLED_SMC_FEATURES_MASK : + ret =smu_feature_get_enabled_mask (smu, (uint32_t *)data,2 ); + *size =8 ; +break ; +case AMDGPU_PP_SENSOR_UVD_POWER : + *(uint32_t *)data =smu_feature_is_enabled (smu,SMU_FEATURE_DPM_UVD_BIT ) ?1 :0 ; + *size =4 ; +break ; +case AMDGPU_PP_SENSOR_VCE_POWER : + *(uint32_t *)data =smu_feature_is_enabled (smu,SMU_FEATURE_DPM_VCE_BIT ) ?1 :0 ; + *size =4 ; +break ; +case AMDGPU_PP_SENSOR_VCN_POWER_STATE : + *(uint32_t *)data = smu->smu_power.power_gate.vcn_gated ?0 :1 ; + *size =4 ; +break ; +default : +if (smu->ppt_funcs->read_sensor) + ret = smu->ppt_funcs->read_sensor (smu, sensor, data, size); +break ; + }mutex_unlock (&smu->mutex);drivers/gpu/drm/amd/powerplay/inc/amdgpu_smu.h +0
-2@@ -695,8 +695,6 @@ int smu_update_table(struct smu_context *smu, enum smu_table_id table_index, intbool is_support_sw_smu (struct amdgpu_device *adev);int smu_reset (struct smu_context *smu); -int smu_common_read_sensor (struct smu_context *smu,enum amd_pp_sensors sensor, -void *data,uint32_t *size);int smu_sys_get_pp_table (struct smu_context *smu,void **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);drivers/gpu/drm/amd/powerplay/smu_v11_0.c +1
-1@@ -1198,7 +1198,7 @@ int smu_v11_0_read_sensor(struct smu_context *smu, *size =4 ;break ;default : - ret =smu_common_read_sensor (smu, sensor, data, size); + ret = -EOPNOTSUPP ;break ; }drivers/gpu/drm/amd/powerplay/smu_v12_0.c +1
-2@@ -226,7 +226,7 @@ int smu_v12_0_read_sensor(struct smu_context *smu, *size =4 ;break ;default : - ret =smu_common_read_sensor (smu, sensor, data, size); + ret = -EOPNOTSUPP ;break ; } --2.27.0
Quoted 4 lines
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 3/3 drm/amd/powerplay: maximum code sharing on sensor reading
In reply to Evan QuanMove the common code to amdgpu_smu.c instead of having one copy in both smu_v11_0.c and smu_v12_0.c.
--- drivers/gpu/drm/amd/powerplay/amdgpu_smu.c | 4 ++++ drivers/gpu/drm/amd/powerplay/smu_v11_0.c | 4 ---- drivers/gpu/drm/amd/powerplay/smu_v12_0.c | 4 ---- 3 files changed, 4 insertions(+), 8 deletions(-)
drivers/gpu/drm/amd/powerplay/amdgpu_smu.c +4 -0
@@ -2322,6 +2322,10 @@ int smu_read_sensor(struct smu_context *smu, *(uint32_t *)data = smu->smu_power.power_gate.vcn_gated ?0 :1 ; *size =4 ;break ; +case AMDGPU_PP_SENSOR_MIN_FAN_RPM : + *(uint32_t *)data =0 ; + *size =4 ; +break ;default :if (smu->ppt_funcs->read_sensor) ret = smu->ppt_funcs->read_sensor (smu, sensor, data, size);
drivers/gpu/drm/amd/powerplay/smu_v11_0.c +0 -4
@@ -1193,10 +1193,6 @@ int smu_v11_0_read_sensor(struct smu_context *smu, ret =smu_v11_0_get_gfx_vdd (smu, (uint32_t *)data); *size =4 ;break ; -case AMDGPU_PP_SENSOR_MIN_FAN_RPM : - *(uint32_t *)data =0 ; - *size =4 ; -break ;default : ret = -EOPNOTSUPP ;break ;
drivers/gpu/drm/amd/powerplay/smu_v12_0.c +0 -4
@@ -221,10 +221,6 @@ int smu_v12_0_read_sensor(struct smu_context *smu, ret =smu_get_current_clk_freq (smu,SMU_GFXCLK , (uint32_t *)data); *size =4 ;break ; -case AMDGPU_PP_SENSOR_MIN_FAN_RPM : - *(uint32_t *)data =0 ; - *size =4 ; -break ;default : ret = -EOPNOTSUPP ;break ;
Signature · 6 lines
2.27.0 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
Re: [PATCH 3/3] drm/amd/powerplay: maximum code sharing on sensor reading
Quoted 6 lines · Evan Quan
Move the common code to
amdgpu_smu.cinstead of having one copy in bothsmu_v11_0.candsmu_v12_0.c.Change-Id Idc59c6f686139d034348a613f1a7b9213198312dSigned-off-by Evan Quan <[email protected]>
Quoted 54 lines
--- drivers/gpu/drm/amd/powerplay/amdgpu_smu.c | 4 ++++ drivers/gpu/drm/amd/powerplay/smu_v11_0.c | 4 ---- drivers/gpu/drm/amd/powerplay/smu_v12_0.c | 4 ---- 3 files changed, 4 insertions(+), 8 deletions(-)drivers/gpu/drm/amd/powerplay/amdgpu_smu.c +4
-0@@ -2322,6 +2322,10 @@ int smu_read_sensor(struct smu_context *smu, *(uint32_t *)data = smu->smu_power.power_gate.vcn_gated ?0 :1 ; *size =4 ;break ; +case AMDGPU_PP_SENSOR_MIN_FAN_RPM : + *(uint32_t *)data =0 ; + *size =4 ; +break ;default :if (smu->ppt_funcs->read_sensor) ret = smu->ppt_funcs->read_sensor (smu, sensor, data, size);drivers/gpu/drm/amd/powerplay/smu_v11_0.c +0
-4@@ -1193,10 +1193,6 @@ int smu_v11_0_read_sensor(struct smu_context *smu, ret =smu_v11_0_get_gfx_vdd (smu, (uint32_t *)data); *size =4 ;break ; -case AMDGPU_PP_SENSOR_MIN_FAN_RPM : - *(uint32_t *)data =0 ; - *size =4 ; -break ;default : ret = -EOPNOTSUPP ;break ;drivers/gpu/drm/amd/powerplay/smu_v12_0.c +0
-5@@ -221,10 +221,6 @@ int smu_v12_0_read_sensor(struct smu_context *smu, ret =smu_get_current_clk_freq (smu,SMU_GFXCLK , (uint32_t *)data); *size =4 ;break ; -case AMDGPU_PP_SENSOR_MIN_FAN_RPM : - *(uint32_t *)data =0 ; - *size =4 ; -break ;default : ret = -EOPNOTSUPP ;break ; --2.27.0
Quoted 4 lines
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
Quoted 7 lines · Evan Quan
Since
SMU_MSG_GetDpmClockFreqis known to be supported for Vega20 and before ASICs only. For those ASICs supporting swSMU, it is not supported.Change-Id I8ee71664baa32e40df5bb793550785120f3770c6Signed-off-by Evan Quan <[email protected]>
Quoted 39 lines
--- drivers/gpu/drm/amd/powerplay/smu_v11_0.c | 17 +++-------------- 1 file changed, 3 insertions(+), 14 deletions(-)drivers/gpu/drm/amd/powerplay/smu_v11_0.c +3
-15@@ -1089,24 +1089,13 @@ int smu_v11_0_get_current_clk_freq(struct smu_context *smu, {int ret =0 ;uint32_t freq =0 ; -int asic_clk_id;if (clk_id >=SMU_CLK_COUNT || !value)return -EINVAL ; - asic_clk_id =smu_clk_get_index (smu, clk_id); -if (asic_clk_id <0 ) -return -EINVAL ; - -/* if don't has GetDpmClockFreq Message, try get current clock by SmuMetrics_t */ -if (smu_msg_get_index (smu, SMU_MSG_GetDpmClockFreq) <0 ) - ret =smu_get_current_clk_freq_by_table (smu, clk_id, &freq); -else { - ret =smu_send_smc_msg_with_param (smu, SMU_MSG_GetDpmClockFreq, - (asic_clk_id <<16 ), &freq); -if (ret) -return ret; - } + ret =smu_get_current_clk_freq_by_table (smu, clk_id, &freq); +if (ret) +return ret; freq *=100 ; *value = freq; --2.27.0
Quoted 4 lines
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx