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

Commit 5e031d9f authored by Alex Deucher's avatar Alex Deucher
Browse files

drm/radeon/pm: update current crtc info after setting the powerstate 



On CI, we need to see if the number of crtcs changes to determine
whether or not we need to upload the mclk table again.  In practice
we don't currently upload the mclk table again after the initial load.
The only reason you would would be to add new states, e.g., for
arbitrary mclk setting which is not currently supported.

Acked-by: default avatarChristian König <christian.koenig@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Cc: stable@vger.kernel.org
parent eda1d1cf

drivers/gpu/drm/radeon/radeon_pm.c

+4 −4
Original line number Diff line number Diff line
@@ -1080,10 +1080,6 @@ static void radeon_dpm_change_power_state_locked(struct radeon_device *rdev) 
	/* update display watermarks based on new power state */

	radeon_bandwidth_update(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;



	/* wait for the rings to drain */

	for (i = 0; i < RADEON_NUM_RINGS; i++) {

		struct radeon_ring *ring = &rdev->ring[i];
@@ -1102,6 +1098,10 @@ static void radeon_dpm_change_power_state_locked(struct radeon_device *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;



	if (rdev->asic->dpm.force_performance_level) {

		if (rdev->pm.dpm.thermal_active) {

			enum radeon_dpm_forced_level level = rdev->pm.dpm.forced_level;