Commit 8b5e6b7f authored by Alex Deucher's avatar Alex Deucher

drm/radeon/dpm: implement force performance levels for 7xx/eg/btc

Allows you to limit the selected power levels via sysfs.
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 70d01a5e
...@@ -2326,9 +2326,9 @@ int btc_dpm_set_power_state(struct radeon_device *rdev) ...@@ -2326,9 +2326,9 @@ int btc_dpm_set_power_state(struct radeon_device *rdev)
return ret; return ret;
} }
ret = rv770_unrestrict_performance_levels_after_switch(rdev); ret = rv770_dpm_force_performance_level(rdev, RADEON_DPM_FORCED_LEVEL_AUTO);
if (ret) { if (ret) {
DRM_ERROR("rv770_unrestrict_performance_levels_after_switch failed\n"); DRM_ERROR("rv770_dpm_force_performance_level failed\n");
return ret; return ret;
} }
......
...@@ -2014,9 +2014,9 @@ int cypress_dpm_set_power_state(struct radeon_device *rdev) ...@@ -2014,9 +2014,9 @@ int cypress_dpm_set_power_state(struct radeon_device *rdev)
if (eg_pi->pcie_performance_request) if (eg_pi->pcie_performance_request)
cypress_notify_link_speed_change_after_state_change(rdev, new_ps, old_ps); cypress_notify_link_speed_change_after_state_change(rdev, new_ps, old_ps);
ret = rv770_unrestrict_performance_levels_after_switch(rdev); ret = rv770_dpm_force_performance_level(rdev, RADEON_DPM_FORCED_LEVEL_AUTO);
if (ret) { if (ret) {
DRM_ERROR("rv770_unrestrict_performance_levels_after_switch failed\n"); DRM_ERROR("rv770_dpm_force_performance_level failed\n");
return ret; return ret;
} }
......
...@@ -71,6 +71,8 @@ typedef uint8_t PPSMC_Result; ...@@ -71,6 +71,8 @@ typedef uint8_t PPSMC_Result;
#define PPSMC_MSG_SwitchToSwState ((uint8_t)0x20) #define PPSMC_MSG_SwitchToSwState ((uint8_t)0x20)
#define PPSMC_MSG_SwitchToInitialState ((uint8_t)0x40) #define PPSMC_MSG_SwitchToInitialState ((uint8_t)0x40)
#define PPSMC_MSG_NoForcedLevel ((uint8_t)0x41) #define PPSMC_MSG_NoForcedLevel ((uint8_t)0x41)
#define PPSMC_MSG_ForceHigh ((uint8_t)0x42)
#define PPSMC_MSG_ForceMediumOrHigh ((uint8_t)0x43)
#define PPSMC_MSG_SwitchToMinimumPower ((uint8_t)0x51) #define PPSMC_MSG_SwitchToMinimumPower ((uint8_t)0x51)
#define PPSMC_MSG_ResumeFromMinimumPower ((uint8_t)0x52) #define PPSMC_MSG_ResumeFromMinimumPower ((uint8_t)0x52)
#define PPSMC_MSG_EnableCac ((uint8_t)0x53) #define PPSMC_MSG_EnableCac ((uint8_t)0x53)
......
...@@ -1393,6 +1393,7 @@ static struct radeon_asic rv770_asic = { ...@@ -1393,6 +1393,7 @@ static struct radeon_asic rv770_asic = {
.get_mclk = &rv770_dpm_get_mclk, .get_mclk = &rv770_dpm_get_mclk,
.print_power_state = &rv770_dpm_print_power_state, .print_power_state = &rv770_dpm_print_power_state,
.debugfs_print_current_performance_level = &rv770_dpm_debugfs_print_current_performance_level, .debugfs_print_current_performance_level = &rv770_dpm_debugfs_print_current_performance_level,
.force_performance_level = &rv770_dpm_force_performance_level,
}, },
.pflip = { .pflip = {
.pre_page_flip = &rs600_pre_page_flip, .pre_page_flip = &rs600_pre_page_flip,
...@@ -1516,6 +1517,7 @@ static struct radeon_asic evergreen_asic = { ...@@ -1516,6 +1517,7 @@ static struct radeon_asic evergreen_asic = {
.get_mclk = &rv770_dpm_get_mclk, .get_mclk = &rv770_dpm_get_mclk,
.print_power_state = &rv770_dpm_print_power_state, .print_power_state = &rv770_dpm_print_power_state,
.debugfs_print_current_performance_level = &rv770_dpm_debugfs_print_current_performance_level, .debugfs_print_current_performance_level = &rv770_dpm_debugfs_print_current_performance_level,
.force_performance_level = &rv770_dpm_force_performance_level,
}, },
.pflip = { .pflip = {
.pre_page_flip = &evergreen_pre_page_flip, .pre_page_flip = &evergreen_pre_page_flip,
...@@ -1762,6 +1764,7 @@ static struct radeon_asic btc_asic = { ...@@ -1762,6 +1764,7 @@ static struct radeon_asic btc_asic = {
.get_mclk = &btc_dpm_get_mclk, .get_mclk = &btc_dpm_get_mclk,
.print_power_state = &rv770_dpm_print_power_state, .print_power_state = &rv770_dpm_print_power_state,
.debugfs_print_current_performance_level = &rv770_dpm_debugfs_print_current_performance_level, .debugfs_print_current_performance_level = &rv770_dpm_debugfs_print_current_performance_level,
.force_performance_level = &rv770_dpm_force_performance_level,
}, },
.pflip = { .pflip = {
.pre_page_flip = &evergreen_pre_page_flip, .pre_page_flip = &evergreen_pre_page_flip,
......
...@@ -478,6 +478,8 @@ void rv770_dpm_print_power_state(struct radeon_device *rdev, ...@@ -478,6 +478,8 @@ void rv770_dpm_print_power_state(struct radeon_device *rdev,
struct radeon_ps *ps); struct radeon_ps *ps);
void rv770_dpm_debugfs_print_current_performance_level(struct radeon_device *rdev, void rv770_dpm_debugfs_print_current_performance_level(struct radeon_device *rdev,
struct seq_file *m); struct seq_file *m);
int rv770_dpm_force_performance_level(struct radeon_device *rdev,
enum radeon_dpm_forced_level level);
/* /*
* evergreen * evergreen
......
...@@ -1471,14 +1471,30 @@ int rv770_restrict_performance_levels_before_switch(struct radeon_device *rdev) ...@@ -1471,14 +1471,30 @@ int rv770_restrict_performance_levels_before_switch(struct radeon_device *rdev)
return 0; return 0;
} }
int rv770_unrestrict_performance_levels_after_switch(struct radeon_device *rdev) int rv770_dpm_force_performance_level(struct radeon_device *rdev,
{ enum radeon_dpm_forced_level level)
if (rv770_send_msg_to_smc(rdev, (PPSMC_Msg)(PPSMC_MSG_NoForcedLevel)) != PPSMC_Result_OK) {
return -EINVAL; PPSMC_Msg msg;
if (level == RADEON_DPM_FORCED_LEVEL_HIGH) {
if (rv770_send_msg_to_smc(rdev, PPSMC_MSG_ZeroLevelsDisabled) != PPSMC_Result_OK)
return -EINVAL;
msg = PPSMC_MSG_ForceHigh;
} else if (level == RADEON_DPM_FORCED_LEVEL_LOW) {
if (rv770_send_msg_to_smc(rdev, PPSMC_MSG_NoForcedLevel) != PPSMC_Result_OK)
return -EINVAL;
msg = (PPSMC_Msg)(PPSMC_MSG_TwoLevelsDisabled);
} else {
if (rv770_send_msg_to_smc(rdev, PPSMC_MSG_NoForcedLevel) != PPSMC_Result_OK)
return -EINVAL;
msg = (PPSMC_Msg)(PPSMC_MSG_ZeroLevelsDisabled);
}
if (rv770_send_msg_to_smc(rdev, (PPSMC_Msg)(PPSMC_MSG_ZeroLevelsDisabled)) != PPSMC_Result_OK) if (rv770_send_msg_to_smc(rdev, msg) != PPSMC_Result_OK)
return -EINVAL; return -EINVAL;
rdev->pm.dpm.forced_level = level;
return 0; return 0;
} }
...@@ -2047,9 +2063,10 @@ int rv770_dpm_set_power_state(struct radeon_device *rdev) ...@@ -2047,9 +2063,10 @@ int rv770_dpm_set_power_state(struct radeon_device *rdev)
if (pi->dcodt) if (pi->dcodt)
rv770_program_dcodt_after_state_switch(rdev, new_ps, old_ps); rv770_program_dcodt_after_state_switch(rdev, new_ps, old_ps);
rv770_set_uvd_clock_after_set_eng_clock(rdev, new_ps, old_ps); rv770_set_uvd_clock_after_set_eng_clock(rdev, new_ps, old_ps);
ret = rv770_unrestrict_performance_levels_after_switch(rdev);
ret = rv770_dpm_force_performance_level(rdev, RADEON_DPM_FORCED_LEVEL_AUTO);
if (ret) { if (ret) {
DRM_ERROR("rv770_unrestrict_performance_levels_after_switch failed\n"); DRM_ERROR("rv770_dpm_force_performance_level failed\n");
return ret; return ret;
} }
......
...@@ -262,7 +262,8 @@ void rv770_stop_dpm(struct radeon_device *rdev); ...@@ -262,7 +262,8 @@ void rv770_stop_dpm(struct radeon_device *rdev);
void r7xx_stop_smc(struct radeon_device *rdev); void r7xx_stop_smc(struct radeon_device *rdev);
void rv770_reset_smio_status(struct radeon_device *rdev); void rv770_reset_smio_status(struct radeon_device *rdev);
int rv770_restrict_performance_levels_before_switch(struct radeon_device *rdev); int rv770_restrict_performance_levels_before_switch(struct radeon_device *rdev);
int rv770_unrestrict_performance_levels_after_switch(struct radeon_device *rdev); int rv770_dpm_force_performance_level(struct radeon_device *rdev,
enum radeon_dpm_forced_level level);
int rv770_halt_smc(struct radeon_device *rdev); int rv770_halt_smc(struct radeon_device *rdev);
int rv770_resume_smc(struct radeon_device *rdev); int rv770_resume_smc(struct radeon_device *rdev);
int rv770_set_sw_state(struct radeon_device *rdev); int rv770_set_sw_state(struct radeon_device *rdev);
......
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