[PATCH] drm/amdgpu: getting fan speed pwm for vega10 properly

[Quan, Evan]

[AMD Official Use Only - General]

Reviewed-by: Evan Quan <evan.quan at amd.com>

> -----Original Message-----
> From: amd-gfx <amd-gfx-bounces at lists.freedesktop.org> On Behalf Of
> stalkerg
> Sent: Sunday, September 18, 2022 3:23 PM
> To: amd-gfx at lists.freedesktop.org
> Cc: Deucher, Alexander <Alexander.Deucher at amd.com>; stalkerg
> <stalkerg at gmail.com>
> Subject: [PATCH] drm/amdgpu: getting fan speed pwm for vega10 properly
> 
> Instead of using RPM speed, we will use a function from vega20 based on
> PWM registers.
> 
> Signed-off-by: Yury Zhuravlev <stalkerg at gmail.com>
> ---
>  .../amd/pm/powerplay/hwmgr/vega10_thermal.c   | 25 +++++++++----------
>  1 file changed, 12 insertions(+), 13 deletions(-)
> 
> diff --git a/drivers/gpu/drm/amd/pm/powerplay/hwmgr/vega10_thermal.c
> b/drivers/gpu/drm/amd/pm/powerplay/hwmgr/vega10_thermal.c
> index dad3e3741a4e..190af79f3236 100644
> --- a/drivers/gpu/drm/amd/pm/powerplay/hwmgr/vega10_thermal.c
> +++ b/drivers/gpu/drm/amd/pm/powerplay/hwmgr/vega10_thermal.c
> @@ -67,22 +67,21 @@ int vega10_fan_ctrl_get_fan_speed_info(struct
> pp_hwmgr *hwmgr,
>  int vega10_fan_ctrl_get_fan_speed_pwm(struct pp_hwmgr *hwmgr,
>  		uint32_t *speed)
>  {
> -	uint32_t current_rpm;
> -	uint32_t percent = 0;
> -
> -	if (hwmgr->thermal_controller.fanInfo.bNoFan)
> -		return 0;
> +	struct amdgpu_device *adev = hwmgr->adev;
> +	uint32_t duty100, duty;
> +	uint64_t tmp64;
> 
> -	if (vega10_get_current_rpm(hwmgr, &current_rpm))
> -		return -1;
> +	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 (hwmgr->thermal_controller.
> -			advanceFanControlParameters.usMaxFanRPM != 0)
> -		percent = current_rpm * 255 /
> -			hwmgr->thermal_controller.
> -			advanceFanControlParameters.usMaxFanRPM;
> +	if (!duty100)
> +		return -EINVAL;
> 
> -	*speed = MIN(percent, 255);
> +	tmp64 = (uint64_t)duty * 255;
> +	do_div(tmp64, duty100);
> +	*speed = MIN((uint32_t)tmp64, 255);
> 
>  	return 0;
>  }
> --
> 2.35.1