diff options
| author | Alex Deucher <alexander.deucher@amd.com> | 2016-03-08 11:31:00 -0500 |
|---|---|---|
| committer | Sasha Levin <sasha.levin@oracle.com> | 2016-03-22 11:11:15 -0400 |
| commit | a077ab0b8d5e9da786a89667ce7ae7e396655b56 (patch) | |
| tree | 60e190ceec4bb5691646ff0791f1c1b1cee82572 | |
| parent | 306cc4da64fe0782ab5a984e888e7476be268d6d (diff) | |
| download | lwn-a077ab0b8d5e9da786a89667ce7ae7e396655b56.tar.gz lwn-a077ab0b8d5e9da786a89667ce7ae7e396655b56.zip | |
Revert "drm/radeon/pm: adjust display configuration after powerstate"
[ Upstream commit d74e766e1916d0e09b86e4b5b9d0f819628fd546 ]
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>
Cc: stable@vger.kernel.org
Signed-off-by: Sasha Levin <sasha.levin@oracle.com>
| -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 d5ea5c106dd1..ab782e3f5d95 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; |