Commit 18aa989a authored by Wenjing Liu's avatar Wenjing Liu Committed by Alex Deucher
Browse files

drm/amd/display: do not skip ODM minimal transition based on new state 



[why]
During 8k video plane resizing we could transition from MPC combine mode
back to ODM combine 2:1 + 8k video plane. In this transition minimal
transition state is based on new state with ODM combine enabled.
We are skipping this and it causes corruption because we have to reassign
a current DPP pipe to a different MPC blending tree which is not supported
seamlessly.

Reviewed-by: default avatarDillon Varone <dillon.varone@amd.com>
Acked-by: default avatarStylon Wang <stylon.wang@amd.com>
Signed-off-by: default avatarWenjing Liu <wenjing.liu@amd.com>
Tested-by: default avatarDaniel Wheeler <daniel.wheeler@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 3a2c0ecc

drivers/gpu/drm/amd/display/dc/core/dc.c

+3 −3
Original line number Diff line number Diff line
@@ -4048,10 +4048,10 @@ static bool commit_minimal_transition_state(struct dc *dc, 
	 * pipe, we must use the minimal transition.

	 */

	for (i = 0; i < dc->res_pool->pipe_count; i++) {

		struct pipe_ctx *pipe = &dc->current_state->res_ctx.pipe_ctx[i];

		struct pipe_ctx *pipe = &transition_base_context->res_ctx.pipe_ctx[i];



		if (pipe->stream && pipe->next_odm_pipe) {

			odm_in_use = true;

		if (resource_is_pipe_type(pipe, OTG_MASTER)) {

			odm_in_use = resource_get_odm_slice_count(pipe) > 1;

			break;

		}

	}