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

drm/amd/pm: correct the fan speed PWM retrieving 



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
retrieving the fan speed PWM.

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 96401f7c

drivers/gpu/drm/amd/include/asic_reg/thm/thm_11_0_2_offset.h

+3 −0
Original line number Diff line number Diff line
@@ -49,4 +49,7 @@ 
#define mmTHM_BACO_CNTL                                                                                0x0081

#define mmTHM_BACO_CNTL_BASE_IDX                                                                       0



#define mmCG_THERMAL_STATUS                                                                            0x006C

#define mmCG_THERMAL_STATUS_BASE_IDX                                                                   0



#endif

drivers/gpu/drm/amd/include/asic_reg/thm/thm_11_0_2_sh_mask.h

+3 −0
Original line number Diff line number Diff line
@@ -92,5 +92,8 @@ 
#define THM_TCON_THERM_TRIP__RSVD3_MASK                                                                       0x7FFFC000L

#define THM_TCON_THERM_TRIP__SW_THERM_TP_MASK                                                                 0x80000000L



#define CG_THERMAL_STATUS__FDO_PWM_DUTY__SHIFT                                                                0x9

#define CG_THERMAL_STATUS__FDO_PWM_DUTY_MASK                                                                  0x0001FE00L



#endif

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

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

				uint32_t speed);



int smu_v11_0_get_fan_speed_percent(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/powerplay/hwmgr/vega20_thermal.c

+15 −9
Original line number Diff line number Diff line
@@ -117,18 +117,24 @@ static int vega20_get_current_rpm(struct pp_hwmgr *hwmgr, uint32_t *current_rpm) 
int vega20_fan_ctrl_get_fan_speed_percent(struct pp_hwmgr *hwmgr,

		uint32_t *speed)

{

	struct vega20_hwmgr *data = (struct vega20_hwmgr *)(hwmgr->backend);

	PPTable_t *pp_table = &(data->smc_state_table.pp_table);

	uint32_t current_rpm, percent = 0;

	int ret = 0;

	struct amdgpu_device *adev = hwmgr->adev;

	uint32_t duty100, duty;

	uint64_t tmp64;



	ret = vega20_get_current_rpm(hwmgr, &current_rpm);

	if (ret)

		return ret;

	duty100 = REG_GET_FIELD(RREG32_SOC15(THM, 0, mmCG_FDO_CTRL1),

				CG_FDO_CTRL1, FMAX_DUTY100);

	duty = REG_GET_FIELD(RREG32_SOC15(THM, 0, mmCG_THERMAL_STATUS),

				CG_THERMAL_STATUS, FDO_PWM_DUTY);



	if (!duty100)

		return -EINVAL;



	percent = current_rpm * 100 / pp_table->FanMaximumRpm;

	tmp64 = (uint64_t)duty * 100;

	do_div(tmp64, duty100);

	*speed = (uint32_t)tmp64;



	*speed = percent > 100 ? 100 : percent;

	if (*speed > 100)

		*speed = 100;



	return 0;

}

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

+1 −24
Original line number Diff line number Diff line
@@ -1162,29 +1162,6 @@ static int arcturus_read_sensor(struct smu_context *smu, 
	return ret;

}



static int arcturus_get_fan_speed_percent(struct smu_context *smu,

					  uint32_t *speed)

{

	int ret;

	u32 rpm;



	if (!speed)

		return -EINVAL;



	switch (smu_v11_0_get_fan_control_mode(smu)) {

	case AMD_FAN_CTRL_AUTO:

		ret = arcturus_get_smu_metrics_data(smu,

						    METRICS_CURR_FANSPEED,

						    &rpm);

		if (!ret && smu->fan_max_rpm)

			*speed = rpm * 100 / smu->fan_max_rpm;

		return ret;

	default:

		*speed = smu->user_dpm_profile.fan_speed_percent;

		return 0;

	}

}



static int arcturus_get_fan_parameters(struct smu_context *smu)

{

	PPTable_t *pptable = smu->smu_table.driver_pptable;
@@ -2270,7 +2247,7 @@ static const struct pptable_funcs arcturus_ppt_funcs = { 
	.print_clk_levels = arcturus_print_clk_levels,

	.force_clk_levels = arcturus_force_clk_levels,

	.read_sensor = arcturus_read_sensor,

	.get_fan_speed_percent = arcturus_get_fan_speed_percent,

	.get_fan_speed_percent = smu_v11_0_get_fan_speed_percent,

	.get_power_profile_mode = arcturus_get_power_profile_mode,

	.set_power_profile_mode = arcturus_set_power_profile_mode,

	.set_performance_level = arcturus_set_performance_level,