Commit 98243917 authored by Alex Deucher's avatar Alex Deucher

drm/radeon/dpm: add pre/post_set_power_state callbacks (6xx-eg)

For r6xx-evergreen, they are no-ops as they don't support
any dynamic state adjustment.
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 84dd1928
...@@ -662,6 +662,16 @@ void r600_stop_dpm(struct radeon_device *rdev) ...@@ -662,6 +662,16 @@ void r600_stop_dpm(struct radeon_device *rdev)
r600_dynamicpm_enable(rdev, false); r600_dynamicpm_enable(rdev, false);
} }
int r600_dpm_pre_set_power_state(struct radeon_device *rdev)
{
return 0;
}
void r600_dpm_post_set_power_state(struct radeon_device *rdev)
{
}
bool r600_is_uvd_state(u32 class, u32 class2) bool r600_is_uvd_state(u32 class, u32 class2)
{ {
if (class & ATOM_PPLIB_CLASSIFICATION_UVDSTATE) if (class & ATOM_PPLIB_CLASSIFICATION_UVDSTATE)
......
...@@ -1152,7 +1152,9 @@ static struct radeon_asic rv6xx_asic = { ...@@ -1152,7 +1152,9 @@ static struct radeon_asic rv6xx_asic = {
.setup_asic = &rv6xx_setup_asic, .setup_asic = &rv6xx_setup_asic,
.enable = &rv6xx_dpm_enable, .enable = &rv6xx_dpm_enable,
.disable = &rv6xx_dpm_disable, .disable = &rv6xx_dpm_disable,
.pre_set_power_state = &r600_dpm_pre_set_power_state,
.set_power_state = &rv6xx_dpm_set_power_state, .set_power_state = &rv6xx_dpm_set_power_state,
.post_set_power_state = &r600_dpm_post_set_power_state,
.display_configuration_changed = &rv6xx_dpm_display_configuration_changed, .display_configuration_changed = &rv6xx_dpm_display_configuration_changed,
.fini = &rv6xx_dpm_fini, .fini = &rv6xx_dpm_fini,
.get_sclk = &rv6xx_dpm_get_sclk, .get_sclk = &rv6xx_dpm_get_sclk,
...@@ -1259,7 +1261,9 @@ static struct radeon_asic rs780_asic = { ...@@ -1259,7 +1261,9 @@ static struct radeon_asic rs780_asic = {
.setup_asic = &rs780_dpm_setup_asic, .setup_asic = &rs780_dpm_setup_asic,
.enable = &rs780_dpm_enable, .enable = &rs780_dpm_enable,
.disable = &rs780_dpm_disable, .disable = &rs780_dpm_disable,
.pre_set_power_state = &r600_dpm_pre_set_power_state,
.set_power_state = &rs780_dpm_set_power_state, .set_power_state = &rs780_dpm_set_power_state,
.post_set_power_state = &r600_dpm_post_set_power_state,
.display_configuration_changed = &rs780_dpm_display_configuration_changed, .display_configuration_changed = &rs780_dpm_display_configuration_changed,
.fini = &rs780_dpm_fini, .fini = &rs780_dpm_fini,
.get_sclk = &rs780_dpm_get_sclk, .get_sclk = &rs780_dpm_get_sclk,
...@@ -1379,7 +1383,9 @@ static struct radeon_asic rv770_asic = { ...@@ -1379,7 +1383,9 @@ static struct radeon_asic rv770_asic = {
.setup_asic = &rv770_dpm_setup_asic, .setup_asic = &rv770_dpm_setup_asic,
.enable = &rv770_dpm_enable, .enable = &rv770_dpm_enable,
.disable = &rv770_dpm_disable, .disable = &rv770_dpm_disable,
.pre_set_power_state = &r600_dpm_pre_set_power_state,
.set_power_state = &rv770_dpm_set_power_state, .set_power_state = &rv770_dpm_set_power_state,
.post_set_power_state = &r600_dpm_post_set_power_state,
.display_configuration_changed = &rv770_dpm_display_configuration_changed, .display_configuration_changed = &rv770_dpm_display_configuration_changed,
.fini = &rv770_dpm_fini, .fini = &rv770_dpm_fini,
.get_sclk = &rv770_dpm_get_sclk, .get_sclk = &rv770_dpm_get_sclk,
...@@ -1499,7 +1505,9 @@ static struct radeon_asic evergreen_asic = { ...@@ -1499,7 +1505,9 @@ static struct radeon_asic evergreen_asic = {
.setup_asic = &cypress_dpm_setup_asic, .setup_asic = &cypress_dpm_setup_asic,
.enable = &cypress_dpm_enable, .enable = &cypress_dpm_enable,
.disable = &cypress_dpm_disable, .disable = &cypress_dpm_disable,
.pre_set_power_state = &r600_dpm_pre_set_power_state,
.set_power_state = &cypress_dpm_set_power_state, .set_power_state = &cypress_dpm_set_power_state,
.post_set_power_state = &r600_dpm_post_set_power_state,
.display_configuration_changed = &cypress_dpm_display_configuration_changed, .display_configuration_changed = &cypress_dpm_display_configuration_changed,
.fini = &cypress_dpm_fini, .fini = &cypress_dpm_fini,
.get_sclk = &rv770_dpm_get_sclk, .get_sclk = &rv770_dpm_get_sclk,
......
...@@ -402,6 +402,8 @@ int r600_mc_wait_for_idle(struct radeon_device *rdev); ...@@ -402,6 +402,8 @@ int r600_mc_wait_for_idle(struct radeon_device *rdev);
u32 r600_get_xclk(struct radeon_device *rdev); u32 r600_get_xclk(struct radeon_device *rdev);
uint64_t r600_get_gpu_clock_counter(struct radeon_device *rdev); uint64_t r600_get_gpu_clock_counter(struct radeon_device *rdev);
int rv6xx_get_temp(struct radeon_device *rdev); int rv6xx_get_temp(struct radeon_device *rdev);
int r600_dpm_pre_set_power_state(struct radeon_device *rdev);
void r600_dpm_post_set_power_state(struct radeon_device *rdev);
/* rv6xx dpm */ /* rv6xx dpm */
int rv6xx_dpm_init(struct radeon_device *rdev); int rv6xx_dpm_init(struct radeon_device *rdev);
int rv6xx_dpm_enable(struct radeon_device *rdev); int rv6xx_dpm_enable(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