diff options
| author | Alex Deucher <alexander.deucher@amd.com> | 2016-03-08 19:31:00 +0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2016-03-16 18:43:00 +0300 |
| commit | f8456804460f5c232f097e72051beea063f16074 (patch) | |
| tree | 797b1da8d171dd0f58e44cbcf933cfb727a6e356 /drivers/gpu/drm/radeon/radeon_pm.c | |
| parent | 7a2d3f49bd33fa1cf7de91b2053e48e47606c33e (diff) | |
| download | linux-f8456804460f5c232f097e72051beea063f16074.tar.xz | |
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 <alexander.deucher@amd.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/gpu/drm/radeon/radeon_pm.c')
| -rw-r--r-- | drivers/gpu/drm/radeon/radeon_pm.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/gpu/drm/radeon/radeon_pm.c b/drivers/gpu/drm/radeon/radeon_pm.c index 1fa81215cea1..60ab31517153 100644 --- 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; |