Commit 21f6be48 authored by Aurabindo Pillai's avatar Aurabindo Pillai Committed by Alex Deucher
Browse files

Revert "drm/amd/display: Demote Error Level When ODM Transition Supported" 



This reverts commit e81b6a44.

Reverting to put in a better solution which does not involve checking
DCN version.

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 d5a43956

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

+3 −12
Original line number Diff line number Diff line
@@ -3811,8 +3811,6 @@ void check_syncd_pipes_for_disabled_master_pipe(struct dc *dc, 
	int i;

	struct pipe_ctx *pipe_ctx, *pipe_ctx_check;



	DC_LOGGER_INIT(dc->ctx->logger);



	pipe_ctx = &context->res_ctx.pipe_ctx[disabled_master_pipe_idx];

	if ((GET_PIPE_SYNCD_FROM_PIPE(pipe_ctx) != disabled_master_pipe_idx) ||

		!IS_PIPE_SYNCD_VALID(pipe_ctx))
@@ -3823,18 +3821,11 @@ 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)) {

			/* On dcn32, this error isn't fatal since hw supports odm transition in fast update*/

			if (dc->ctx->dce_version == DCN_VERSION_3_2 ||

					dc->ctx->dce_version == DCN_VERSION_3_21)

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

					i, disabled_master_pipe_idx);

			else

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

			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,