Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a077ab0b authored by Alex Deucher's avatar Alex Deucher Committed by Sasha Levin
Browse files

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: default avatarAlex Deucher <alexander.deucher@amd.com>
Cc: stable@vger.kernel.org
Signed-off-by: default avatarSasha Levin <sasha.levin@oracle.com>
parent 306cc4da

drivers/gpu/drm/radeon/radeon_pm.c

+2 −3
Original line number Diff line number Diff line
@@ -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;