| From d74e766e1916d0e09b86e4b5b9d0f819628fd546 Mon Sep 17 00:00:00 2001 |
| From: Alex Deucher <alexander.deucher@amd.com> |
| Date: Tue, 8 Mar 2016 11:31:00 -0500 |
| Subject: Revert "drm/radeon/pm: adjust display configuration after powerstate" |
| |
| From: Alex Deucher <alexander.deucher@amd.com> |
| |
| 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 <alexander.deucher@amd.com> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| |
| --- |
| drivers/gpu/drm/radeon/radeon_pm.c | 5 ++--- |
| 1 file changed, 2 insertions(+), 3 deletions(-) |
| |
| --- a/drivers/gpu/drm/radeon/radeon_pm.c |
| +++ b/drivers/gpu/drm/radeon/radeon_pm.c |
| @@ -1075,6 +1075,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++) { |
| @@ -1091,9 +1093,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; |