Commit b4c80462 authored by Ausef Yousof's avatar Ausef Yousof Committed by Alex Deucher
Browse files

drm/amd/display: Remove hw w/a toggle if on DP2/HPO 



[why&how]
Applying a hw w/a only relevant to DIG FIFO causing corruption
using HPO, do not apply the w/a if on DP2/HPO

Reviewed-by: default avatarCharlene Liu <charlene.liu@amd.com>
Signed-off-by: default avatarAusef Yousof <Ausef.Yousof@amd.com>
Signed-off-by: default avatarZaeem Mohamed <zaeem.mohamed@amd.com>
Tested-by: default avatarDaniel Wheeler <daniel.wheeler@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 820a84ed

drivers/gpu/drm/amd/display/dc/clk_mgr/dcn35/dcn35_clk_mgr.c

+9 −2
Original line number Diff line number Diff line
@@ -133,6 +133,8 @@ static void dcn35_disable_otg_wa(struct clk_mgr *clk_mgr_base, struct dc_state * 
	for (i = 0; i < dc->res_pool->pipe_count; ++i) {

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

		struct pipe_ctx *new_pipe = &context->res_ctx.pipe_ctx[i];

		struct clk_mgr_internal *clk_mgr_internal = TO_CLK_MGR_INTERNAL(clk_mgr_base);

		struct dccg *dccg = clk_mgr_internal->dccg;

		struct pipe_ctx *pipe = safe_to_lower

			? &context->res_ctx.pipe_ctx[i]

			: &dc->current_state->res_ctx.pipe_ctx[i];
@@ -149,8 +151,13 @@ static void dcn35_disable_otg_wa(struct clk_mgr *clk_mgr_base, struct dc_state * 
		new_pipe->stream_res.stream_enc &&

		new_pipe->stream_res.stream_enc->funcs->is_fifo_enabled &&

		new_pipe->stream_res.stream_enc->funcs->is_fifo_enabled(new_pipe->stream_res.stream_enc);

		if (pipe->stream && (pipe->stream->dpms_off || dc_is_virtual_signal(pipe->stream->signal) ||

			!pipe->stream->link_enc) && !stream_changed_otg_dig_on) {

		bool has_active_hpo = dccg->ctx->dc->link_srv->dp_is_128b_132b_signal(old_pipe) && dccg->ctx->dc->link_srv->dp_is_128b_132b_signal(new_pipe);



		if (!has_active_hpo && !dccg->ctx->dc->link_srv->dp_is_128b_132b_signal(pipe) &&

					(pipe->stream && (pipe->stream->dpms_off || dc_is_virtual_signal(pipe->stream->signal) ||

					!pipe->stream->link_enc) && !stream_changed_otg_dig_on)) {





			/* This w/a should not trigger when we have a dig active */

			if (disable) {

				if (pipe->stream_res.tg && pipe->stream_res.tg->funcs->immediate_disable_crtc)