drm/amd/pm: disallow the fan setting if there is no fan on smu13
Subsystems (3)
Kenneth Feng
maintainerPATCH 1/1 drm/amd/pm: disallow the fan setting if there is no fan on smu13
disallow the fan setting if there is no fan on smu13
--- drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-)
drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0.c +6 -3
@@ -1131,7 +1131,9 @@ smu_v13_0_display_clock_voltage_request(struct smu_context *smu,uint32_t smu_v13_0_get_fan_control_mode (struct smu_context *smu) { -if (!smu_cmn_feature_is_enabled (smu,SMU_FEATURE_FAN_CONTROL_BIT )) +if (!smu_cmn_feature_is_supported (smu,SMU_FEATURE_FAN_CONTROL_BIT )) +return AMD_FAN_CTRL_NONE ; +else if (!smu_cmn_feature_is_enabled (smu,SMU_FEATURE_FAN_CONTROL_BIT ))return AMD_FAN_CTRL_MANUAL ;else return AMD_FAN_CTRL_AUTO ;
@@ -1143,7 +1145,7 @@ smu_v13_0_auto_fan_control(struct smu_context *smu, bool auto_fan_control)int ret =0 ;if (!smu_cmn_feature_is_supported (smu,SMU_FEATURE_FAN_CONTROL_BIT )) -return 0 ; +return -EINVAL ; ret =smu_cmn_feature_set_enabled (smu,SMU_FEATURE_FAN_CONTROL_BIT , auto_fan_control);if (ret)
@@ -1204,7 +1206,8 @@ smu_v13_0_set_fan_control_mode(struct smu_context *smu,switch (mode) {case AMD_FAN_CTRL_NONE : - ret =smu_v13_0_set_fan_speed_pwm (smu,255 ); +if (smu_cmn_feature_is_supported (smu,SMU_FEATURE_FAN_CONTROL_BIT )) + ret = -EINVAL ;break ;case AMD_FAN_CTRL_MANUAL : ret =smu_v13_0_auto_fan_control (smu,0 );
Signature · 1 line
2.34.1
Quoted 12 lines · Kenneth Feng
disallow the fan setting if there is no fan on smu13
Signed-off-by Kenneth Feng <[email protected]>--- drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-)drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0.c +0
-0
drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0.c smu_v13_0_display_clock_voltage_request(struct smu_context *smu, · line 1135
Quoted 6 lines
drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0.c +2
-1@@ -1131,7 +1131,9 @@ smu_v13_0_display_clock_voltage_request(struct smu_context *smu,uint32_t smu_v13_0_get_fan_control_mode (struct smu_context *smu) { -if (!smu_cmn_feature_is_enabled (smu,SMU_FEATURE_FAN_CONTROL_BIT )) +if (!smu_cmn_feature_is_supported (smu,SMU_FEATURE_FAN_CONTROL_BIT )) +return AMD_FAN_CTRL_NONE ;
If there is no PMFW fan control, isn't it better to set pm.no_fan?
Thanks,
Lijo
Quoted 23 lines
drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0.c +4
-2+else if (!smu_cmn_feature_is_enabled (smu,SMU_FEATURE_FAN_CONTROL_BIT ))return AMD_FAN_CTRL_MANUAL ;else return AMD_FAN_CTRL_AUTO ;@@ -1143,7 +1145,7 @@ smu_v13_0_auto_fan_control(struct smu_context *smu, bool auto_fan_control)int ret =0 ;if (!smu_cmn_feature_is_supported (smu,SMU_FEATURE_FAN_CONTROL_BIT )) -return 0 ; +return -EINVAL ; ret =smu_cmn_feature_set_enabled (smu,SMU_FEATURE_FAN_CONTROL_BIT , auto_fan_control);if (ret)@@ -1204,7 +1206,8 @@ smu_v13_0_set_fan_control_mode(struct smu_context *smu,switch (mode) {case AMD_FAN_CTRL_NONE : - ret =smu_v13_0_set_fan_speed_pwm (smu,255 ); +if (smu_cmn_feature_is_supported (smu,SMU_FEATURE_FAN_CONTROL_BIT )) + ret = -EINVAL ;break ;case AMD_FAN_CTRL_MANUAL : ret =smu_v13_0_auto_fan_control (smu,0 );
Feng, Kenneth
maintainer[AMD Official Use Only - General]
Currently no_fan is determined in sw init.
if (!smu->ppt_funcs->get_fan_control_mode)
smu->adev->pm.no_fan = true;This is the case that some boards have fans and some don't have. smu->ppt_funcs->get_fan_control_mode still need to be defined. !smu_cmn_feature_is_supported(smu, SMU_FEATURE_FAN_CONTROL_BIT) is enough to get the fan capability. Not sure if it's better to depend on pm.no_fan.
Thanks.
-----Original Message-----
From: Lazar, Lijo <[email protected]>
Sent: Tuesday, August 8, 2023 6:12 PM
To: Feng, Kenneth <[email protected]>; [email protected]
Cc: Arif, Maisam <[email protected]>
Subject: Re: [PATCH] drm/amd/pm: disallow the fan setting if there is no fan on smu13
Quoted 12 lines · Kenneth Feng
disallow the fan setting if there is no fan on smu13
Signed-off-by Kenneth Feng <[email protected]>--- drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-)drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0.c +0
-0
drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0.c smu_v13_0_display_clock_voltage_request(struct smu_context *smu, · line 1135
Quoted 6 lines
drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0.c +2
-1@@ -1131,7 +1131,9 @@ smu_v13_0_display_clock_voltage_request(struct smu_context *smu,uint32_t smu_v13_0_get_fan_control_mode (struct smu_context *smu) { -if (!smu_cmn_feature_is_enabled (smu,SMU_FEATURE_FAN_CONTROL_BIT )) +if (!smu_cmn_feature_is_supported (smu,SMU_FEATURE_FAN_CONTROL_BIT )) +return AMD_FAN_CTRL_NONE ;
If there is no PMFW fan control, isn't it better to set pm.no_fan?
Thanks,
Lijo
Quoted 23 lines
drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0.c +4
-2+else if (!smu_cmn_feature_is_enabled (smu,SMU_FEATURE_FAN_CONTROL_BIT ))return AMD_FAN_CTRL_MANUAL ;else return AMD_FAN_CTRL_AUTO ;@@ -1143,7 +1145,7 @@ smu_v13_0_auto_fan_control(struct smu_context *smu, bool auto_fan_control)int ret =0 ;if (!smu_cmn_feature_is_supported (smu,SMU_FEATURE_FAN_CONTROL_BIT )) -return 0 ; +return -EINVAL ; ret =smu_cmn_feature_set_enabled (smu,SMU_FEATURE_FAN_CONTROL_BIT , auto_fan_control);if (ret)@@ -1204,7 +1206,8 @@ smu_v13_0_set_fan_control_mode(struct smu_context *smu,switch (mode) {case AMD_FAN_CTRL_NONE : - ret =smu_v13_0_set_fan_speed_pwm (smu,255 ); +if (smu_cmn_feature_is_supported (smu,SMU_FEATURE_FAN_CONTROL_BIT )) + ret = -EINVAL ;break ;case AMD_FAN_CTRL_MANUAL : ret =smu_v13_0_auto_fan_control (smu,0 );
Quoted 10 lines · Kenneth
[AMD Official Use Only - General]
Currently
no_fanis determined in sw init.if (!smu->ppt_funcs->get_fan_control_mode) smu->adev->pm.no_fan = true;This is the case that some boards have fans and some don't have.
smu->ppt_funcs->get_fan_control_modestill need to be defined. !smu_cmn_feature_is_supported(smu,SMU_FEATURE_FAN_CONTROL_BIT) is enough to get the fan capability. Not sure if it's better to depend on pm.no_fan.
What I meant is, based on fan control feature bit you could set pm.no_fan flag.
When pm.no_fan is set, we won't create hwmon fan attributes for get/set[1]. That way you could avoid the other checks also. Also when PMFW is not controlling, it's not guaranteed that the fan controller is initialized correctly for get to return correct speed/pwm.
[1] https://elixir.bootlin.com/linux/latest/source/drivers/gpu/drm/amd/pm/amdgpu_pm.c#L3338
Thanks,
Lijo
Quoted 61 lines
Thanks.
-----Original Message-----
From: Lazar, Lijo <[email protected]>
Sent: Tuesday, August 8, 2023 6:12 PM
To: Feng, Kenneth <[email protected]>; [email protected]
Cc: Arif, Maisam <[email protected]>
Subject: Re: [PATCH] drm/amd/pm: disallow the fan setting if there is no fan on smu13Quoted 12 lines · Kenneth Feng
disallow the fan setting if there is no fan on smu13
Signed-off-by Kenneth Feng <[email protected]>--- drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-)drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0.c +0
-0drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0.c smu_v13_0_display_clock_voltage_request(struct smu_context *smu, · line 1135
Quoted 6 lines
drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0.c +2
-1@@ -1131,7 +1131,9 @@ smu_v13_0_display_clock_voltage_request(struct smu_context *smu,uint32_t smu_v13_0_get_fan_control_mode (struct smu_context *smu) { -if (!smu_cmn_feature_is_enabled (smu,SMU_FEATURE_FAN_CONTROL_BIT )) +if (!smu_cmn_feature_is_supported (smu,SMU_FEATURE_FAN_CONTROL_BIT )) +return AMD_FAN_CTRL_NONE ;If there is no PMFW fan control, isn't it better to set pm.no_fan?
Thanks,
LijoQuoted 23 lines
drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0.c +4
-2+else if (!smu_cmn_feature_is_enabled (smu,SMU_FEATURE_FAN_CONTROL_BIT ))return AMD_FAN_CTRL_MANUAL ;else return AMD_FAN_CTRL_AUTO ;@@ -1143,7 +1145,7 @@ smu_v13_0_auto_fan_control(struct smu_context *smu, bool auto_fan_control)int ret =0 ;if (!smu_cmn_feature_is_supported (smu,SMU_FEATURE_FAN_CONTROL_BIT )) -return 0 ; +return -EINVAL ; ret =smu_cmn_feature_set_enabled (smu,SMU_FEATURE_FAN_CONTROL_BIT , auto_fan_control);if (ret)@@ -1204,7 +1206,8 @@ smu_v13_0_set_fan_control_mode(struct smu_context *smu,switch (mode) {case AMD_FAN_CTRL_NONE : - ret =smu_v13_0_set_fan_speed_pwm (smu,255 ); +if (smu_cmn_feature_is_supported (smu,SMU_FEATURE_FAN_CONTROL_BIT )) + ret = -EINVAL ;break ;case AMD_FAN_CTRL_MANUAL : ret =smu_v13_0_auto_fan_control (smu,0 );