Commit 702f8dd8 authored by Zhan Liu's avatar Zhan Liu Committed by Alex Deucher
Browse files

drm/amd/display: revert "Reset fifo after enable otg" 



[Why]
This change causes regression, that prevents some systems
from lighting up internal displays.

[How]
Revert this patch until a new solution is ready.

Tested-by: default avatarDaniel Wheeler <daniel.wheeler@amd.com>
Reviewed-by: default avatarCharlene Liu <Charlene.Liu@amd.com>
Acked-by: default avatarStylon Wang <stylon.wang@amd.com>
Signed-off-by: default avatarZhan Liu <Zhan.Liu@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 88839870

drivers/gpu/drm/amd/display/dc/dce110/dce110_hw_sequencer.c

+0 −5
Original line number Diff line number Diff line
@@ -1567,11 +1567,6 @@ static enum dc_status apply_single_controller_ctx_to_hw( 
			pipe_ctx->stream_res.stream_enc,

			pipe_ctx->stream_res.tg->inst);



	if (dc_is_embedded_signal(pipe_ctx->stream->signal) &&

		pipe_ctx->stream_res.stream_enc->funcs->reset_fifo)

		pipe_ctx->stream_res.stream_enc->funcs->reset_fifo(

			pipe_ctx->stream_res.stream_enc);



	if (dc_is_dp_signal(pipe_ctx->stream->signal))

		dp_source_sequence_trace(link, DPCD_SOURCE_SEQ_AFTER_CONNECT_DIG_FE_OTG);

drivers/gpu/drm/amd/display/dc/dcn10/dcn10_stream_encoder.c

+0 −15
Original line number Diff line number Diff line
@@ -902,19 +902,6 @@ void enc1_stream_encoder_stop_dp_info_packets( 


}



void enc1_stream_encoder_reset_fifo(

	struct stream_encoder *enc)

{

	struct dcn10_stream_encoder *enc1 = DCN10STRENC_FROM_STRENC(enc);



	/* set DIG_START to 0x1 to reset FIFO */

	REG_UPDATE(DIG_FE_CNTL, DIG_START, 1);

	udelay(100);



	/* write 0 to take the FIFO out of reset */

	REG_UPDATE(DIG_FE_CNTL, DIG_START, 0);

}



void enc1_stream_encoder_dp_blank(

	struct dc_link *link,

	struct stream_encoder *enc)
@@ -1600,8 +1587,6 @@ static const struct stream_encoder_funcs dcn10_str_enc_funcs = { 
		enc1_stream_encoder_send_immediate_sdp_message,

	.stop_dp_info_packets =

		enc1_stream_encoder_stop_dp_info_packets,

	.reset_fifo =

		enc1_stream_encoder_reset_fifo,

	.dp_blank =

		enc1_stream_encoder_dp_blank,

	.dp_unblank =

drivers/gpu/drm/amd/display/dc/dcn10/dcn10_stream_encoder.h

+0 −3
Original line number Diff line number Diff line
@@ -626,9 +626,6 @@ void enc1_stream_encoder_send_immediate_sdp_message( 
void enc1_stream_encoder_stop_dp_info_packets(

	struct stream_encoder *enc);



void enc1_stream_encoder_reset_fifo(

	struct stream_encoder *enc);



void enc1_stream_encoder_dp_blank(

	struct dc_link *link,

	struct stream_encoder *enc);

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

+0 −2
Original line number Diff line number Diff line
@@ -593,8 +593,6 @@ static const struct stream_encoder_funcs dcn20_str_enc_funcs = { 
		enc1_stream_encoder_send_immediate_sdp_message,

	.stop_dp_info_packets =

		enc1_stream_encoder_stop_dp_info_packets,

	.reset_fifo =

		enc1_stream_encoder_reset_fifo,

	.dp_blank =

		enc1_stream_encoder_dp_blank,

	.dp_unblank =

drivers/gpu/drm/amd/display/dc/dcn30/dcn30_dio_stream_encoder.c

+0 −2
Original line number Diff line number Diff line
@@ -789,8 +789,6 @@ static const struct stream_encoder_funcs dcn30_str_enc_funcs = { 
		enc3_stream_encoder_update_dp_info_packets,

	.stop_dp_info_packets =

		enc1_stream_encoder_stop_dp_info_packets,

	.reset_fifo =

		enc1_stream_encoder_reset_fifo,

	.dp_blank =

		enc1_stream_encoder_dp_blank,

	.dp_unblank =