drm/radeon/dpm: add new pre/post_set_power_state callbacks
Needed to properly handle dynamic state adjustment.
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
diff --git a/drivers/gpu/drm/radeon/radeon_pm.c b/drivers/gpu/drm/radeon/radeon_pm.c
index 7143c91..4e2ccc6 100644
--- a/drivers/gpu/drm/radeon/radeon_pm.c
+++ b/drivers/gpu/drm/radeon/radeon_pm.c
@@ -700,6 +700,7 @@
int i;
struct radeon_ps *ps;
enum radeon_pm_state_type dpm_state;
+ int ret;
/* if dpm init failed */
if (!rdev->pm.dpm_enabled)
@@ -766,6 +767,12 @@
down_write(&rdev->pm.mclk_lock);
mutex_lock(&rdev->ring_lock);
+ if (rdev->asic->dpm.pre_set_power_state) {
+ ret = radeon_dpm_pre_set_power_state(rdev);
+ if (ret)
+ goto done;
+ }
+
/* update display watermarks based on new power state */
radeon_bandwidth_update(rdev);
/* update displays */
@@ -787,6 +794,10 @@
/* update current power state */
rdev->pm.dpm.current_ps = rdev->pm.dpm.requested_ps;
+ if (rdev->asic->dpm.post_set_power_state)
+ radeon_dpm_post_set_power_state(rdev);
+
+done:
mutex_unlock(&rdev->ring_lock);
up_write(&rdev->pm.mclk_lock);
mutex_unlock(&rdev->ddev->struct_mutex);