[PATCH v3 09/10] drm/i915/display: Don't use DSB if psr mode changing

[Jouni Högander]

Changing PSR mode using DSB is not implemented. Do not use DSB when PSR
mode is changing.

Signed-off-by: Jouni Högander <jouni.hogan...@intel.com>
---
 drivers/gpu/drm/i915/display/intel_display.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/i915/display/intel_display.c 
b/drivers/gpu/drm/i915/display/intel_display.c
index d76454a69399..e448ff64660a 100644
--- a/drivers/gpu/drm/i915/display/intel_display.c
+++ b/drivers/gpu/drm/i915/display/intel_display.c
@@ -7647,7 +7647,8 @@ static void intel_atomic_dsb_finish(struct 
intel_atomic_state *state,
                !new_crtc_state->scaler_state.scaler_users &&
                !old_crtc_state->scaler_state.scaler_users &&
                !intel_crtc_needs_modeset(new_crtc_state) &&
-               !intel_crtc_needs_fastset(new_crtc_state);
+               !intel_crtc_needs_fastset(new_crtc_state) &&
+               !intel_psr_is_psr_mode_changing(old_crtc_state, new_crtc_state);
 
        if (!new_crtc_state->use_dsb && !new_crtc_state->dsb_color_vblank)
                return;
-- 
2.43.0