| 187,6 → 187,9 |
|---|
| static PPSMC_Result ci_send_msg_to_smc_with_parameter(struct radeon_device *rdev, |
| PPSMC_Msg msg, u32 parameter); |
| |
| static void ci_thermal_start_smc_fan_control(struct radeon_device *rdev); |
| static void ci_fan_ctrl_set_default_mode(struct radeon_device *rdev); |
| |
| static struct ci_power_info *ci_get_pi(struct radeon_device *rdev) |
| { |
| struct ci_power_info *pi = rdev->pm.dpm.priv; |
| 1043,22 → 1046,24 |
|---|
| return -EINVAL; |
| } |
| |
| pi->fan_is_controlled_by_smc = true; |
| return 0; |
| } |
| |
| #if 0 |
| static int ci_fan_ctrl_stop_smc_fan_control(struct radeon_device *rdev) |
| { |
| PPSMC_Result ret; |
| struct ci_power_info *pi = ci_get_pi(rdev); |
| |
| ret = ci_send_msg_to_smc(rdev, PPSMC_StopFanControl); |
| if (ret == PPSMC_Result_OK) |
| if (ret == PPSMC_Result_OK) { |
| pi->fan_is_controlled_by_smc = false; |
| return 0; |
| else |
| } else |
| return -EINVAL; |
| } |
| |
| static int ci_fan_ctrl_get_fan_speed_percent(struct radeon_device *rdev, |
| int ci_fan_ctrl_get_fan_speed_percent(struct radeon_device *rdev, |
| u32 *speed) |
| { |
| u32 duty, duty100; |
| 1083,22 → 1088,23 |
|---|
| return 0; |
| } |
| |
| static int ci_fan_ctrl_set_fan_speed_percent(struct radeon_device *rdev, |
| int ci_fan_ctrl_set_fan_speed_percent(struct radeon_device *rdev, |
| u32 speed) |
| { |
| u32 tmp; |
| u32 duty, duty100; |
| u64 tmp64; |
| struct ci_power_info *pi = ci_get_pi(rdev); |
| |
| if (rdev->pm.no_fan) |
| return -ENOENT; |
| |
| if (pi->fan_is_controlled_by_smc) |
| return -EINVAL; |
| |
| if (speed > 100) |
| return -EINVAL; |
| |
| if (rdev->pm.dpm.fan.ucode_fan_control) |
| ci_fan_ctrl_stop_smc_fan_control(rdev); |
| |
| duty100 = (RREG32_SMC(CG_FDO_CTRL1) & FMAX_DUTY100_MASK) >> FMAX_DUTY100_SHIFT; |
| |
| if (duty100 == 0) |
| 1112,11 → 1118,38 |
|---|
| tmp |= FDO_STATIC_DUTY(duty); |
| WREG32_SMC(CG_FDO_CTRL0, tmp); |
| |
| ci_fan_ctrl_set_static_mode(rdev, FDO_PWM_MODE_STATIC); |
| return 0; |
| } |
| |
| void ci_fan_ctrl_set_mode(struct radeon_device *rdev, u32 mode) |
| { |
| if (mode) { |
| /* stop auto-manage */ |
| if (rdev->pm.dpm.fan.ucode_fan_control) |
| ci_fan_ctrl_stop_smc_fan_control(rdev); |
| ci_fan_ctrl_set_static_mode(rdev, mode); |
| } else { |
| /* restart auto-manage */ |
| if (rdev->pm.dpm.fan.ucode_fan_control) |
| ci_thermal_start_smc_fan_control(rdev); |
| else |
| ci_fan_ctrl_set_default_mode(rdev); |
| } |
| } |
| |
| u32 ci_fan_ctrl_get_mode(struct radeon_device *rdev) |
| { |
| struct ci_power_info *pi = ci_get_pi(rdev); |
| u32 tmp; |
| |
| if (pi->fan_is_controlled_by_smc) |
| return 0; |
| |
| tmp = RREG32_SMC(CG_FDO_CTRL2) & FDO_PWM_MODE_MASK; |
| return (tmp >> FDO_PWM_MODE_SHIFT); |
| } |
| |
| #if 0 |
| static int ci_fan_ctrl_get_fan_speed_rpm(struct radeon_device *rdev, |
| u32 *speed) |
| { |
| 1698,10 → 1731,12 |
|---|
| return 0; |
| } |
| |
| #if 0 |
| static int ci_set_boot_state(struct radeon_device *rdev) |
| { |
| return ci_enable_sclk_mclk_dpm(rdev, false); |
| } |
| #endif |
| |
| static u32 ci_get_average_sclk_freq(struct radeon_device *rdev) |
| { |
| 5343,10 → 5378,12 |
|---|
| return 0; |
| } |
| |
| #if 0 |
| void ci_dpm_reset_asic(struct radeon_device *rdev) |
| { |
| ci_set_boot_state(rdev); |
| } |
| #endif |
| |
| void ci_dpm_display_configuration_changed(struct radeon_device *rdev) |
| { |
| 5781,7 → 5818,7 |
|---|
| tmp |= DPM_ENABLED; |
| break; |
| default: |
| DRM_ERROR("Invalid PCC GPIO: %u!\n", gpio.shift); |
| DRM_DEBUG("Invalid PCC GPIO: %u!\n", gpio.shift); |
| break; |
| } |
| WREG32_SMC(CNB_PWRMGT_CNTL, tmp); |
| 5885,6 → 5922,20 |
|---|
| r600_dpm_print_ps_status(rdev, rps); |
| } |
| |
| u32 ci_dpm_get_current_sclk(struct radeon_device *rdev) |
| { |
| u32 sclk = ci_get_average_sclk_freq(rdev); |
| |
| return sclk; |
| } |
| |
| u32 ci_dpm_get_current_mclk(struct radeon_device *rdev) |
| { |
| u32 mclk = ci_get_average_mclk_freq(rdev); |
| |
| return mclk; |
| } |
| |
| u32 ci_dpm_get_sclk(struct radeon_device *rdev, bool low) |
| { |
| struct ci_power_info *pi = ci_get_pi(rdev); |