|
@@ -1079,8 +1079,6 @@ force:
|
|
|
|
|
|
/* update display watermarks based on new power state */
|
|
/* update display watermarks based on new power state */
|
|
radeon_bandwidth_update(rdev);
|
|
radeon_bandwidth_update(rdev);
|
|
- /* update displays */
|
|
|
|
- radeon_dpm_display_configuration_changed(rdev);
|
|
|
|
|
|
|
|
rdev->pm.dpm.current_active_crtcs = rdev->pm.dpm.new_active_crtcs;
|
|
rdev->pm.dpm.current_active_crtcs = rdev->pm.dpm.new_active_crtcs;
|
|
rdev->pm.dpm.current_active_crtc_count = rdev->pm.dpm.new_active_crtc_count;
|
|
rdev->pm.dpm.current_active_crtc_count = rdev->pm.dpm.new_active_crtc_count;
|
|
@@ -1101,6 +1099,9 @@ force:
|
|
|
|
|
|
radeon_dpm_post_set_power_state(rdev);
|
|
radeon_dpm_post_set_power_state(rdev);
|
|
|
|
|
|
|
|
+ /* update displays */
|
|
|
|
+ radeon_dpm_display_configuration_changed(rdev);
|
|
|
|
+
|
|
if (rdev->asic->dpm.force_performance_level) {
|
|
if (rdev->asic->dpm.force_performance_level) {
|
|
if (rdev->pm.dpm.thermal_active) {
|
|
if (rdev->pm.dpm.thermal_active) {
|
|
enum radeon_dpm_forced_level level = rdev->pm.dpm.forced_level;
|
|
enum radeon_dpm_forced_level level = rdev->pm.dpm.forced_level;
|