Commit 762e8feb authored by Aurabindo Pillai's avatar Aurabindo Pillai Committed by Alex Deucher
Browse files

drm/amd/display: fix an error check condition for synced pipes 



Checking for disabled master pipe on a timing synchronized pipe is
incorrect in the case of ODM combine. This case is acceptable as long as
the disabled master pipe is part of the ODM tree. Skip printing error
message if this condition holds true.

Tested-by: default avatarDaniel Wheeler <Daniel.Wheeler@amd.com>
Reviewed-by: default avatarDillon Varone <Dillon.Varone@amd.com>
Acked-by: default avatarRodrigo Siqueira <Rodrigo.Siqueira@amd.com>
Signed-off-by: default avatarAurabindo Pillai <aurabindo.pillai@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 21f6be48

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

+13 −2
Original line number Diff line number Diff line
@@ -3821,11 +3821,22 @@ void check_syncd_pipes_for_disabled_master_pipe(struct dc *dc, 
		pipe_ctx_check = &context->res_ctx.pipe_ctx[i];



		if ((GET_PIPE_SYNCD_FROM_PIPE(pipe_ctx_check) == disabled_master_pipe_idx) &&

			IS_PIPE_SYNCD_VALID(pipe_ctx_check) && (i != disabled_master_pipe_idx))

		    IS_PIPE_SYNCD_VALID(pipe_ctx_check) && (i != disabled_master_pipe_idx)) {

			struct pipe_ctx *first_pipe = pipe_ctx_check;



			while (first_pipe->prev_odm_pipe)

				first_pipe = first_pipe->prev_odm_pipe;

			/* When ODM combine is enabled, this case is expected. If the disabled pipe

			 * is part of the ODM tree, then we should not print an error.

			 * */

			if (first_pipe->pipe_idx == disabled_master_pipe_idx)

				continue;



			DC_ERR("DC: Failure: pipe_idx[%d] syncd with disabled master pipe_idx[%d]\n",

				   i, disabled_master_pipe_idx);

		}

	}

}



void reset_sync_context_for_pipe(const struct dc *dc,

	struct dc_state *context,