Commit ae5a9780 authored Feb 19, 2016 by Alex Deucher Committed by Sasha Levin Mar 08, 2016

drm/radeon/pm: adjust display configuration after powerstate



[ Upstream commit 39d4275058baf53e89203407bf3841ff2c74fa32 ]

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>
Cc: stable@vger.kernel.org
Signed-off-by: Sasha Levin <sasha.levin@oracle.com>

parent f5054278

drivers/gpu/drm/radeon/radeon_pm.c

+3 −2

Original line number	Diff line number	Diff line
		@@ -936,8 +936,6 @@ force:

		/* 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;
		@@ -958,6 +956,9 @@ force:

		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;