drm/amd/powerplay: enable fan RPM and pwm settings V2
Subsystems (2)
PATCH 1/1 drm/amd/powerplay: enable fan RPM and pwm settings V2
Manual fan RPM and pwm setting on vega20 are
available now.
V2: correct the register for fan speed setting and
avoid divide-by-zero
Change-Id Iad45a169d6984acc091c4efaf46973619fe43a29
Signed-off-by Evan Quan <[email protected]>
Reviewed-by Alex Deucher <[email protected]>
Reviewed-by Rex Zhu <[email protected]>
--- .../include/asic_reg/thm/thm_11_0_2_offset.h | 12 ++ .../include/asic_reg/thm/thm_11_0_2_sh_mask.h | 10 ++ .../drm/amd/powerplay/hwmgr/vega20_hwmgr.c | 27 ++++ .../drm/amd/powerplay/hwmgr/vega20_thermal.c | 151 +++++++++++++++++- .../drm/amd/powerplay/hwmgr/vega20_thermal.h | 11 +- 5 files changed, 207 insertions(+), 4 deletions(-)
drivers/gpu/drm/amd/include/asic_reg/thm/thm_11_0_2_offset.h +12 -0
@@ -26,6 +26,18 @@#define mmCG_MULT_THERMAL_STATUS 0x005f#define mmCG_MULT_THERMAL_STATUS_BASE_IDX 0 +#define mmCG_FDO_CTRL0 0x0067 +#define mmCG_FDO_CTRL0_BASE_IDX 0 + +#define mmCG_FDO_CTRL1 0x0068 +#define mmCG_FDO_CTRL1_BASE_IDX 0 + +#define mmCG_FDO_CTRL2 0x0069 +#define mmCG_FDO_CTRL2_BASE_IDX 0 + +#define mmCG_TACH_CTRL 0x006a +#define mmCG_TACH_CTRL_BASE_IDX 0 +#define mmTHM_THERMAL_INT_ENA 0x000a#define mmTHM_THERMAL_INT_ENA_BASE_IDX 0#define mmTHM_THERMAL_INT_CTRL 0x000b
drivers/gpu/drm/amd/include/asic_reg/thm/thm_11_0_2_sh_mask.h +10 -0
@@ -28,6 +28,16 @@#define CG_MULT_THERMAL_STATUS__CTF_TEMP__SHIFT 0x9#define CG_MULT_THERMAL_STATUS__ASIC_MAX_TEMP_MASK 0x000001FFL#define CG_MULT_THERMAL_STATUS__CTF_TEMP_MASK 0x0003FE00L +#define CG_FDO_CTRL2__TMIN__SHIFT 0x0 +#define CG_FDO_CTRL2__TMIN_MASK 0x000000FFL +#define CG_FDO_CTRL2__FDO_PWM_MODE__SHIFT 0xb +#define CG_FDO_CTRL2__FDO_PWM_MODE_MASK 0x00003800L +#define CG_FDO_CTRL1__FMAX_DUTY100__SHIFT 0x0 +#define CG_FDO_CTRL1__FMAX_DUTY100_MASK 0x000000FFL +#define CG_FDO_CTRL0__FDO_STATIC_DUTY__SHIFT 0x0 +#define CG_FDO_CTRL0__FDO_STATIC_DUTY_MASK 0x000000FFL +#define CG_TACH_CTRL__TARGET_PERIOD__SHIFT 0x3 +#define CG_TACH_CTRL__TARGET_PERIOD_MASK 0xFFFFFFF8L//THM_THERMAL_INT_ENA #define THM_THERMAL_INT_ENA__THERM_INTH_SET__SHIFT 0x0
drivers/gpu/drm/amd/powerplay/hwmgr/vega20_hwmgr.c +27 -0
@@ -2289,6 +2289,25 @@ static uint32_t vega20_get_fan_control_mode(struct pp_hwmgr *hwmgr)return AMD_FAN_CTRL_AUTO ; } +static void vega20_set_fan_control_mode (struct pp_hwmgr *hwmgr,uint32_t mode) +{ +switch (mode) { +case AMD_FAN_CTRL_NONE : +vega20_fan_ctrl_set_fan_speed_percent (hwmgr,100 ); +break ; +case AMD_FAN_CTRL_MANUAL : +if (PP_CAP (PHM_PlatformCaps_MicrocodeFanControl)) +vega20_fan_ctrl_stop_smc_fan_control (hwmgr); +break ; +case AMD_FAN_CTRL_AUTO : +if (PP_CAP (PHM_PlatformCaps_MicrocodeFanControl)) +vega20_fan_ctrl_start_smc_fan_control (hwmgr); +break ; +default : +break ; + } +} +static int vega20_get_dal_power_level (struct pp_hwmgr *hwmgr,struct amd_pp_simple_clock_info *info) {
@@ -3452,12 +3471,20 @@ static const struct pp_hwmgr_func vega20_hwmgr_funcs = { .disable_smc_firmware_ctf = vega20_thermal_disable_alert,/* fan control related */ + .get_fan_speed_percent = + vega20_fan_ctrl_get_fan_speed_percent, + .set_fan_speed_percent = + vega20_fan_ctrl_set_fan_speed_percent, .get_fan_speed_info = vega20_fan_ctrl_get_fan_speed_info, .get_fan_speed_rpm = vega20_fan_ctrl_get_fan_speed_rpm, + .set_fan_speed_rpm = + vega20_fan_ctrl_set_fan_speed_rpm, .get_fan_control_mode = vega20_get_fan_control_mode, + .set_fan_control_mode = + vega20_set_fan_control_mode,/* smu memory related */ .notify_cac_buffer_info = vega20_notify_cac_buffer_info,
drivers/gpu/drm/amd/powerplay/hwmgr/vega20_thermal.c +149 -2
173 lines not on this page · raw message
drivers/gpu/drm/amd/powerplay/hwmgr/vega20_thermal.h +9 -2
@@ -50,15 +50,22 @@ struct vega20_temperature {#define FDO_PWM_MODE_STATIC_RPM 5extern int vega20_thermal_get_temperature (struct pp_hwmgr *hwmgr); -extern int vega20_thermal_stop_thermal_controller (struct pp_hwmgr *hwmgr);extern int vega20_fan_ctrl_get_fan_speed_info (struct pp_hwmgr *hwmgr,struct phm_fan_speed_info *fan_speed_info); -extern int vega20_fan_ctrl_reset_fan_speed_to_default (struct pp_hwmgr *hwmgr);extern int vega20_fan_ctrl_get_fan_speed_rpm (struct pp_hwmgr *hwmgr,uint32_t *speed); +extern int vega20_fan_ctrl_set_fan_speed_rpm (struct pp_hwmgr *hwmgr, +uint32_t speed); +extern int vega20_fan_ctrl_get_fan_speed_percent (struct pp_hwmgr *hwmgr, +uint32_t *speed); +extern int vega20_fan_ctrl_set_fan_speed_percent (struct pp_hwmgr *hwmgr, +uint32_t speed); +extern int vega20_fan_ctrl_stop_smc_fan_control (struct pp_hwmgr *hwmgr); +extern int vega20_fan_ctrl_start_smc_fan_control (struct pp_hwmgr *hwmgr);extern int vega20_thermal_disable_alert (struct pp_hwmgr *hwmgr);extern int vega20_start_thermal_controller (struct pp_hwmgr *hwmgr,struct PP_TemperatureRange *range); +extern int vega20_thermal_stop_thermal_controller (struct pp_hwmgr *hwmgr);#endif
Signature · 6 lines
2.19.0 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx