Commit e03cea36 authored by Alex Deucher's avatar Alex Deucher

drm/radeon/dpm: add smc fan control for CI (v2)

Enable smc fan control for CI boards.  Should
reduce the fan noise on systems with a higher
default fan profile.

v2: disable by default, add additional fan setup, rpm control

bug:
https://bugs.freedesktop.org/show_bug.cgi?id=73338Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 39471ad3
This diff is collapsed.
...@@ -266,6 +266,7 @@ struct ci_power_info { ...@@ -266,6 +266,7 @@ struct ci_power_info {
bool caps_automatic_dc_transition; bool caps_automatic_dc_transition;
bool caps_sclk_throttle_low_notification; bool caps_sclk_throttle_low_notification;
bool caps_dynamic_ac_timing; bool caps_dynamic_ac_timing;
bool caps_od_fuzzy_fan_control_support;
/* flags */ /* flags */
bool thermal_protection; bool thermal_protection;
bool pcie_performance_request; bool pcie_performance_request;
...@@ -287,6 +288,10 @@ struct ci_power_info { ...@@ -287,6 +288,10 @@ struct ci_power_info {
struct ci_ps current_ps; struct ci_ps current_ps;
struct radeon_ps requested_rps; struct radeon_ps requested_rps;
struct ci_ps requested_ps; struct ci_ps requested_ps;
/* fan control */
bool fan_ctrl_is_in_default_mode;
u32 t_min;
u32 fan_ctrl_default_mode;
}; };
#define CISLANDS_VOLTAGE_CONTROL_NONE 0x0 #define CISLANDS_VOLTAGE_CONTROL_NONE 0x0
......
...@@ -186,7 +186,10 @@ ...@@ -186,7 +186,10 @@
#define DIG_THERM_DPM(x) ((x) << 14) #define DIG_THERM_DPM(x) ((x) << 14)
#define DIG_THERM_DPM_MASK 0x003FC000 #define DIG_THERM_DPM_MASK 0x003FC000
#define DIG_THERM_DPM_SHIFT 14 #define DIG_THERM_DPM_SHIFT 14
#define CG_THERMAL_STATUS 0xC0300008
#define FDO_PWM_DUTY(x) ((x) << 9)
#define FDO_PWM_DUTY_MASK (0xff << 9)
#define FDO_PWM_DUTY_SHIFT 9
#define CG_THERMAL_INT 0xC030000C #define CG_THERMAL_INT 0xC030000C
#define CI_DIG_THERM_INTH(x) ((x) << 8) #define CI_DIG_THERM_INTH(x) ((x) << 8)
#define CI_DIG_THERM_INTH_MASK 0x0000FF00 #define CI_DIG_THERM_INTH_MASK 0x0000FF00
...@@ -196,7 +199,10 @@ ...@@ -196,7 +199,10 @@
#define CI_DIG_THERM_INTL_SHIFT 16 #define CI_DIG_THERM_INTL_SHIFT 16
#define THERM_INT_MASK_HIGH (1 << 24) #define THERM_INT_MASK_HIGH (1 << 24)
#define THERM_INT_MASK_LOW (1 << 25) #define THERM_INT_MASK_LOW (1 << 25)
#define CG_MULT_THERMAL_CTRL 0xC0300010
#define TEMP_SEL(x) ((x) << 20)
#define TEMP_SEL_MASK (0xff << 20)
#define TEMP_SEL_SHIFT 20
#define CG_MULT_THERMAL_STATUS 0xC0300014 #define CG_MULT_THERMAL_STATUS 0xC0300014
#define ASIC_MAX_TEMP(x) ((x) << 0) #define ASIC_MAX_TEMP(x) ((x) << 0)
#define ASIC_MAX_TEMP_MASK 0x000001ff #define ASIC_MAX_TEMP_MASK 0x000001ff
...@@ -205,6 +211,36 @@ ...@@ -205,6 +211,36 @@
#define CTF_TEMP_MASK 0x0003fe00 #define CTF_TEMP_MASK 0x0003fe00
#define CTF_TEMP_SHIFT 9 #define CTF_TEMP_SHIFT 9
#define CG_FDO_CTRL0 0xC0300064
#define FDO_STATIC_DUTY(x) ((x) << 0)
#define FDO_STATIC_DUTY_MASK 0x0000000F
#define FDO_STATIC_DUTY_SHIFT 0
#define CG_FDO_CTRL1 0xC0300068
#define FMAX_DUTY100(x) ((x) << 0)
#define FMAX_DUTY100_MASK 0x0000000F
#define FMAX_DUTY100_SHIFT 0
#define CG_FDO_CTRL2 0xC030006C
#define TMIN(x) ((x) << 0)
#define TMIN_MASK 0x0000000F
#define TMIN_SHIFT 0
#define FDO_PWM_MODE(x) ((x) << 11)
#define FDO_PWM_MODE_MASK (3 << 11)
#define FDO_PWM_MODE_SHIFT 11
#define TACH_PWM_RESP_RATE(x) ((x) << 25)
#define TACH_PWM_RESP_RATE_MASK (0x7f << 25)
#define TACH_PWM_RESP_RATE_SHIFT 25
#define CG_TACH_CTRL 0xC0300070
# define EDGE_PER_REV(x) ((x) << 0)
# define EDGE_PER_REV_MASK (0x7 << 0)
# define EDGE_PER_REV_SHIFT 0
# define TARGET_PERIOD(x) ((x) << 3)
# define TARGET_PERIOD_MASK 0xfffffff8
# define TARGET_PERIOD_SHIFT 3
#define CG_TACH_STATUS 0xC0300074
# define TACH_PERIOD(x) ((x) << 0)
# define TACH_PERIOD_MASK 0xffffffff
# define TACH_PERIOD_SHIFT 0
#define CG_ECLK_CNTL 0xC05000AC #define CG_ECLK_CNTL 0xC05000AC
# define ECLK_DIVIDER_MASK 0x7f # define ECLK_DIVIDER_MASK 0x7f
# define ECLK_DIR_CNTL_EN (1 << 8) # define ECLK_DIR_CNTL_EN (1 << 8)
......
...@@ -59,6 +59,11 @@ ...@@ -59,6 +59,11 @@
#define FDO_MODE_HARDWARE 0 #define FDO_MODE_HARDWARE 0
#define FDO_MODE_PIECE_WISE_LINEAR 1 #define FDO_MODE_PIECE_WISE_LINEAR 1
enum FAN_CONTROL {
FAN_CONTROL_FUZZY,
FAN_CONTROL_TABLE
};
#define PPSMC_Result_OK ((uint8_t)0x01) #define PPSMC_Result_OK ((uint8_t)0x01)
#define PPSMC_Result_Failed ((uint8_t)0xFF) #define PPSMC_Result_Failed ((uint8_t)0xFF)
...@@ -155,6 +160,7 @@ typedef uint8_t PPSMC_Result; ...@@ -155,6 +160,7 @@ typedef uint8_t PPSMC_Result;
#define PPSMC_MSG_MASTER_DeepSleep_ON ((uint16_t) 0x18F) #define PPSMC_MSG_MASTER_DeepSleep_ON ((uint16_t) 0x18F)
#define PPSMC_MSG_MASTER_DeepSleep_OFF ((uint16_t) 0x190) #define PPSMC_MSG_MASTER_DeepSleep_OFF ((uint16_t) 0x190)
#define PPSMC_MSG_Remove_DC_Clamp ((uint16_t) 0x191) #define PPSMC_MSG_Remove_DC_Clamp ((uint16_t) 0x191)
#define PPSMC_MSG_SetFanPwmMax ((uint16_t) 0x19A)
#define PPSMC_MSG_API_GetSclkFrequency ((uint16_t) 0x200) #define PPSMC_MSG_API_GetSclkFrequency ((uint16_t) 0x200)
#define PPSMC_MSG_API_GetMclkFrequency ((uint16_t) 0x201) #define PPSMC_MSG_API_GetMclkFrequency ((uint16_t) 0x201)
......
...@@ -96,6 +96,14 @@ typedef struct _ATOM_PPLIB_FANTABLE2 ...@@ -96,6 +96,14 @@ typedef struct _ATOM_PPLIB_FANTABLE2
USHORT usTMax; // The max temperature USHORT usTMax; // The max temperature
} ATOM_PPLIB_FANTABLE2; } ATOM_PPLIB_FANTABLE2;
typedef struct _ATOM_PPLIB_FANTABLE3
{
ATOM_PPLIB_FANTABLE2 basicTable2;
UCHAR ucFanControlMode;
USHORT usFanPWMMax;
USHORT usFanOutputSensitivity;
} ATOM_PPLIB_FANTABLE3;
typedef struct _ATOM_PPLIB_EXTENDEDHEADER typedef struct _ATOM_PPLIB_EXTENDEDHEADER
{ {
USHORT usSize; USHORT usSize;
......
...@@ -811,6 +811,7 @@ union power_info { ...@@ -811,6 +811,7 @@ union power_info {
union fan_info { union fan_info {
struct _ATOM_PPLIB_FANTABLE fan; struct _ATOM_PPLIB_FANTABLE fan;
struct _ATOM_PPLIB_FANTABLE2 fan2; struct _ATOM_PPLIB_FANTABLE2 fan2;
struct _ATOM_PPLIB_FANTABLE3 fan3;
}; };
static int r600_parse_clk_voltage_dep_table(struct radeon_clock_voltage_dependency_table *radeon_table, static int r600_parse_clk_voltage_dep_table(struct radeon_clock_voltage_dependency_table *radeon_table,
...@@ -900,6 +901,14 @@ int r600_parse_extended_power_table(struct radeon_device *rdev) ...@@ -900,6 +901,14 @@ int r600_parse_extended_power_table(struct radeon_device *rdev)
else else
rdev->pm.dpm.fan.t_max = 10900; rdev->pm.dpm.fan.t_max = 10900;
rdev->pm.dpm.fan.cycle_delay = 100000; rdev->pm.dpm.fan.cycle_delay = 100000;
if (fan_info->fan.ucFanTableFormat >= 3) {
rdev->pm.dpm.fan.control_mode = fan_info->fan3.ucFanControlMode;
rdev->pm.dpm.fan.default_max_fan_pwm =
le16_to_cpu(fan_info->fan3.usFanPWMMax);
rdev->pm.dpm.fan.default_fan_output_sensitivity = 4836;
rdev->pm.dpm.fan.fan_output_sensitivity =
le16_to_cpu(fan_info->fan3.usFanOutputSensitivity);
}
rdev->pm.dpm.fan.ucode_fan_control = true; rdev->pm.dpm.fan.ucode_fan_control = true;
} }
} }
......
...@@ -1494,6 +1494,10 @@ struct radeon_dpm_fan { ...@@ -1494,6 +1494,10 @@ struct radeon_dpm_fan {
u8 t_hyst; u8 t_hyst;
u32 cycle_delay; u32 cycle_delay;
u16 t_max; u16 t_max;
u8 control_mode;
u16 default_max_fan_pwm;
u16 default_fan_output_sensitivity;
u16 fan_output_sensitivity;
bool ucode_fan_control; bool ucode_fan_control;
}; };
......
...@@ -431,6 +431,31 @@ struct SMU7_Discrete_MCRegisters ...@@ -431,6 +431,31 @@ struct SMU7_Discrete_MCRegisters
typedef struct SMU7_Discrete_MCRegisters SMU7_Discrete_MCRegisters; typedef struct SMU7_Discrete_MCRegisters SMU7_Discrete_MCRegisters;
struct SMU7_Discrete_FanTable
{
uint16_t FdoMode;
int16_t TempMin;
int16_t TempMed;
int16_t TempMax;
int16_t Slope1;
int16_t Slope2;
int16_t FdoMin;
int16_t HystUp;
int16_t HystDown;
int16_t HystSlope;
int16_t TempRespLim;
int16_t TempCurr;
int16_t SlopeCurr;
int16_t PwmCurr;
uint32_t RefreshPeriod;
int16_t FdoMax;
uint8_t TempSrc;
int8_t Padding;
};
typedef struct SMU7_Discrete_FanTable SMU7_Discrete_FanTable;
struct SMU7_Discrete_PmFuses { struct SMU7_Discrete_PmFuses {
// dw0-dw1 // dw0-dw1
uint8_t BapmVddCVidHiSidd[8]; uint8_t BapmVddCVidHiSidd[8];
...@@ -462,7 +487,10 @@ struct SMU7_Discrete_PmFuses { ...@@ -462,7 +487,10 @@ struct SMU7_Discrete_PmFuses {
uint8_t BapmVddCVidHiSidd2[8]; uint8_t BapmVddCVidHiSidd2[8];
// dw11-dw12 // dw11-dw12
uint32_t Reserved6[2]; int16_t FuzzyFan_ErrorSetDelta;
int16_t FuzzyFan_ErrorRateSetDelta;
int16_t FuzzyFan_PwmSetDelta;
uint16_t CalcMeasPowerBlend;
// dw13-dw16 // dw13-dw16
uint8_t GnbLPML[16]; uint8_t GnbLPML[16];
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment