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

Commit 8ffca5dc authored by Leo (Sunpeng) Li's avatar Leo (Sunpeng) Li Committed by Alex Deucher
Browse files

drm/amd/display: Do DC mode-change check when adding CRTCs



Within atomic check, dm_update_crtcs_state is called twice. First to
remove from the dc_state, and subsequently to add to it.

In both calls, a secondary mode-change check is done using dc-level
states. We shouldn't be doing this while removing, since a new
dc_stream_state has not been created to do the necessary comparison.
Because of this, the mode_changed flag within the DRM state can be
mistakenly set to false. Doing so only when adding prevents this.

We are also guaranteed that a call to add will come after remove, or
else the atomic check fails (and a commit will not happen).

Signed-off-by: default avatarLeo (Sunpeng) Li <sunpeng.li@amd.com>
Reviewed-by: default avatarTony Cheng <Tony.Cheng@amd.com>
Acked-by: default avatarHarry Wentland <harry.wentland@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 1b61973f
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -4460,7 +4460,7 @@ static int dm_update_crtcs_state(struct dc *dc,
			}
		}

		if (dc_is_stream_unchanged(new_stream, dm_old_crtc_state->stream) &&
		if (enable && dc_is_stream_unchanged(new_stream, dm_old_crtc_state->stream) &&
				dc_is_stream_scaling_unchanged(new_stream, dm_old_crtc_state->stream)) {

			new_crtc_state->mode_changed = false;