Commit f3289d04 authored by Evan Quan's avatar Evan Quan Committed by Alex Deucher
Browse files

drm/amd/pm: correct the fan speed RPM setting 



The relationship "PWM = RPM / smu->fan_max_rpm" between fan speed
PWM and RPM is not true for SMU11 ASICs. So, we need a new way to
perform the fan speed RPM setting.

Signed-off-by: default avatarEvan Quan <evan.quan@amd.com>
Reviewed-by: default avatarLijo Lazar <lijo.lazar@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 893cf382

drivers/gpu/drm/amd/pm/inc/amdgpu_smu.h

+5 −0
Original line number Diff line number Diff line
@@ -1047,6 +1047,11 @@ struct pptable_funcs { 
	 */

	int (*set_fan_speed_percent)(struct smu_context *smu, uint32_t speed);



	/**

	 * @set_fan_speed_rpm: Set a static fan speed in rpm.

	 */

	int (*set_fan_speed_rpm)(struct smu_context *smu, uint32_t speed);



	/**

	 * @set_xgmi_pstate: Set inter-chip global memory interconnect pstate.

	 * &pstate: Pstate to set. D0 if Nonzero, D3 otherwise.

drivers/gpu/drm/amd/pm/inc/smu_v11_0.h

+3 −0
Original line number Diff line number Diff line
@@ -224,6 +224,9 @@ smu_v11_0_set_fan_control_mode(struct smu_context *smu, 
int smu_v11_0_set_fan_speed_percent(struct smu_context *smu,

				    uint32_t speed);



int smu_v11_0_set_fan_speed_rpm(struct smu_context *smu,

				uint32_t speed);



int smu_v11_0_set_xgmi_pstate(struct smu_context *smu,

				     uint32_t pstate);

drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c

+5 −4
Original line number Diff line number Diff line
@@ -2190,12 +2190,13 @@ static int smu_set_fan_speed_rpm(void *handle, uint32_t speed) 


	mutex_lock(&smu->mutex);



	if (smu->ppt_funcs->set_fan_speed_percent) {

	if (smu->ppt_funcs->set_fan_speed_rpm) {

		ret = smu->ppt_funcs->set_fan_speed_rpm(smu, speed);

		if (!ret && !(smu->user_dpm_profile.flags & SMU_DPM_USER_PROFILE_RESTORE)) {

			percent = speed * 100 / smu->fan_max_rpm;

		ret = smu->ppt_funcs->set_fan_speed_percent(smu, percent);

		if (!ret && !(smu->user_dpm_profile.flags & SMU_DPM_USER_PROFILE_RESTORE))

			smu->user_dpm_profile.fan_speed_percent = percent;

		}

	}



	mutex_unlock(&smu->mutex);

drivers/gpu/drm/amd/pm/swsmu/smu11/arcturus_ppt.c

+1 −0
Original line number Diff line number Diff line
@@ -2316,6 +2316,7 @@ static const struct pptable_funcs arcturus_ppt_funcs = { 
	.get_fan_control_mode = smu_v11_0_get_fan_control_mode,

	.set_fan_control_mode = smu_v11_0_set_fan_control_mode,

	.set_fan_speed_percent = smu_v11_0_set_fan_speed_percent,

	.set_fan_speed_rpm = smu_v11_0_set_fan_speed_rpm,

	.set_xgmi_pstate = smu_v11_0_set_xgmi_pstate,

	.gfx_off_control = smu_v11_0_gfx_off_control,

	.register_irq_handler = smu_v11_0_register_irq_handler,

drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c

+1 −0
Original line number Diff line number Diff line
@@ -3271,6 +3271,7 @@ static const struct pptable_funcs navi10_ppt_funcs = { 
	.get_fan_control_mode = smu_v11_0_get_fan_control_mode,

	.set_fan_control_mode = smu_v11_0_set_fan_control_mode,

	.set_fan_speed_percent = smu_v11_0_set_fan_speed_percent,

	.set_fan_speed_rpm = smu_v11_0_set_fan_speed_rpm,

	.set_xgmi_pstate = smu_v11_0_set_xgmi_pstate,

	.gfx_off_control = smu_v11_0_gfx_off_control,

	.register_irq_handler = smu_v11_0_register_irq_handler,