| From 39d4275058baf53e89203407bf3841ff2c74fa32 Mon Sep 17 00:00:00 2001 |
| From: Alex Deucher <alexander.deucher@amd.com> |
| Date: Fri, 19 Feb 2016 18:05:10 -0500 |
| Subject: drm/radeon/pm: adjust display configuration after powerstate |
| MIME-Version: 1.0 |
| Content-Type: text/plain; charset=UTF-8 |
| Content-Transfer-Encoding: 8bit |
| |
| From: Alex Deucher <alexander.deucher@amd.com> |
| |
| commit 39d4275058baf53e89203407bf3841ff2c74fa32 upstream. |
| |
| set_power_state defaults to no displays, so we need to update |
| the display configuration after setting up the powerstate on the |
| first call. In most cases this is not an issue since ends up |
| getting called multiple times at any given modeset and the proper |
| order is achieved in the display changed handling at the top of |
| the function. |
| |
| Reviewed-by: Christian Kรถnig <christian.koenig@amd.com> |
| Acked-by: Jordan Lazare <Jordan.Lazare@amd.com> |
| Signed-off-by: Alex Deucher <alexander.deucher@amd.com> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| |
| --- |
| drivers/gpu/drm/radeon/radeon_pm.c | 5 +++-- |
| 1 file changed, 3 insertions(+), 2 deletions(-) |
| |
| --- a/drivers/gpu/drm/radeon/radeon_pm.c |
| +++ b/drivers/gpu/drm/radeon/radeon_pm.c |
| @@ -915,8 +915,6 @@ static void radeon_dpm_change_power_stat |
| |
| /* update display watermarks based on new power state */ |
| 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_crtc_count = rdev->pm.dpm.new_active_crtc_count; |
| @@ -936,6 +934,9 @@ static void radeon_dpm_change_power_stat |
| |
| radeon_dpm_post_set_power_state(rdev); |
| |
| + /* update displays */ |
| + radeon_dpm_display_configuration_changed(rdev); |
| + |
| if (rdev->asic->dpm.force_performance_level) { |
| if (rdev->pm.dpm.thermal_active) { |
| enum radeon_dpm_forced_level level = rdev->pm.dpm.forced_level; |
