1 files changed, 3 insertions, 3 deletions

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c
index 66855b62a603..95a4a25d8df9 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c
@@ -649,9 +649,6 @@ force:
         /* update display watermarks based on new power state */
         amdgpu_display_bandwidth_update(adev);
 
-        adev->pm.dpm.current_active_crtcs = adev->pm.dpm.new_active_crtcs;
-        adev->pm.dpm.current_active_crtc_count = adev->pm.dpm.new_active_crtc_count;
-
         /* wait for the rings to drain */
         for (i = 0; i < AMDGPU_MAX_RINGS; i++) {
                 struct amdgpu_ring *ring = adev->rings[i];
@@ -670,6 +667,9 @@ force:
         /* update displays */
         amdgpu_dpm_display_configuration_changed(adev);
 
+        adev->pm.dpm.current_active_crtcs = adev->pm.dpm.new_active_crtcs;
+        adev->pm.dpm.current_active_crtc_count = adev->pm.dpm.new_active_crtc_count;
+
         if (adev->pm.funcs->force_performance_level) {
                 if (adev->pm.dpm.thermal_active) {
                         enum amdgpu_dpm_forced_level level = adev->pm.dpm.forced_level;