Commit 324b1fcb authored by sunglee's avatar sunglee Committed by Alex Deucher
Browse files

drm/amd/display: DCN2X Prefer ODM over bottom pipe to find second pipe 



[WHY]
When finding a second pipe for pipe split, currently will look for
bottom pipe in context first to decide the second pipe. This causes
issues in 2 plane to 1 plane transitions like fullscreen video where
bottom pipe no longer exists in the new configuration.

[HOW]
If previous context had an ODM pipe, use that to find the secondary pipe
first before looking at bottom pipe.

Reviewed-by: default avatarDmytro Laktyushkin <Dmytro.Laktyushkin@amd.com>
Acked-by: default avatarRodrigo Siqueira <Rodrigo.Siqueira@amd.com>
Signed-off-by: default avatarsunglee <sunglee@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 0070a5b7

drivers/gpu/drm/amd/display/dc/dcn20/dcn20_resource.c

+4 −4
Original line number Diff line number Diff line
@@ -2531,16 +2531,16 @@ struct pipe_ctx *dcn20_find_secondary_pipe(struct dc *dc, 
		 * pick that pipe as secondary

		 * Same logic applies for ODM pipes

		 */

		if (dc->current_state->res_ctx.pipe_ctx[primary_pipe->pipe_idx].bottom_pipe) {

			preferred_pipe_idx = dc->current_state->res_ctx.pipe_ctx[primary_pipe->pipe_idx].bottom_pipe->pipe_idx;

		if (dc->current_state->res_ctx.pipe_ctx[primary_pipe->pipe_idx].next_odm_pipe) {

			preferred_pipe_idx = dc->current_state->res_ctx.pipe_ctx[primary_pipe->pipe_idx].next_odm_pipe->pipe_idx;

			if (res_ctx->pipe_ctx[preferred_pipe_idx].stream == NULL) {

				secondary_pipe = &res_ctx->pipe_ctx[preferred_pipe_idx];

				secondary_pipe->pipe_idx = preferred_pipe_idx;

			}

		}

		if (secondary_pipe == NULL &&

				dc->current_state->res_ctx.pipe_ctx[primary_pipe->pipe_idx].next_odm_pipe) {

			preferred_pipe_idx = dc->current_state->res_ctx.pipe_ctx[primary_pipe->pipe_idx].next_odm_pipe->pipe_idx;

				dc->current_state->res_ctx.pipe_ctx[primary_pipe->pipe_idx].bottom_pipe) {

			preferred_pipe_idx = dc->current_state->res_ctx.pipe_ctx[primary_pipe->pipe_idx].bottom_pipe->pipe_idx;

			if (res_ctx->pipe_ctx[preferred_pipe_idx].stream == NULL) {

				secondary_pipe = &res_ctx->pipe_ctx[preferred_pipe_idx];

				secondary_pipe->pipe_idx = preferred_pipe_idx;