From: Alex Deucher Date: Tue, 8 Mar 2016 16:31:00 +0000 (-0500) Subject: Revert "drm/radeon/pm: adjust display configuration after powerstate" X-Git-Tag: v3.16.35~254 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=055071f35bcd5e4d37254b1ee27ac6e1ca3ec5f3;p=thirdparty%2Fkernel%2Fstable.git Revert "drm/radeon/pm: adjust display configuration after powerstate" commit d74e766e1916d0e09b86e4b5b9d0f819628fd546 upstream. This reverts commit 39d4275058baf53e89203407bf3841ff2c74fa32. This caused a regression on some older hardware. bug: https://bugzilla.kernel.org/show_bug.cgi?id=113891 Signed-off-by: Alex Deucher Signed-off-by: Luis Henriques --- diff --git a/drivers/gpu/drm/radeon/radeon_pm.c b/drivers/gpu/drm/radeon/radeon_pm.c index a05d569fa0386..afd4adaf9f2d7 100644 --- a/drivers/gpu/drm/radeon/radeon_pm.c +++ b/drivers/gpu/drm/radeon/radeon_pm.c @@ -936,6 +936,8 @@ force: /* update display watermarks based on new power state */ radeon_bandwidth_update(rdev); + /* update displays */ + radeon_dpm_display_configuration_changed(rdev); /* wait for the rings to drain */ for (i = 0; i < RADEON_NUM_RINGS; i++) { @@ -952,9 +954,6 @@ force: radeon_dpm_post_set_power_state(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; rdev->pm.dpm.single_display = single_display;