Skip to content

Commit 49a6ebb

Browse files
Zhan Liualexdeucher
authored andcommitted
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: Daniel Wheeler <[email protected]> Reviewed-by: Charlene Liu <[email protected]> Acked-by: Stylon Wang <[email protected]> Signed-off-by: Zhan Liu <[email protected]> Signed-off-by: Alex Deucher <[email protected]> Cc: [email protected]
1 parent f5fa54f commit 49a6ebb

File tree

6 files changed

+0
-31
lines changed

6 files changed

+0
-31
lines changed

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

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1608,11 +1608,6 @@ static enum dc_status apply_single_controller_ctx_to_hw(
16081608
pipe_ctx->stream_res.stream_enc,
16091609
pipe_ctx->stream_res.tg->inst);
16101610

1611-
if (dc_is_embedded_signal(pipe_ctx->stream->signal) &&
1612-
pipe_ctx->stream_res.stream_enc->funcs->reset_fifo)
1613-
pipe_ctx->stream_res.stream_enc->funcs->reset_fifo(
1614-
pipe_ctx->stream_res.stream_enc);
1615-
16161611
if (dc_is_dp_signal(pipe_ctx->stream->signal))
16171612
dp_source_sequence_trace(link, DPCD_SOURCE_SEQ_AFTER_CONNECT_DIG_FE_OTG);
16181613

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

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -902,19 +902,6 @@ void enc1_stream_encoder_stop_dp_info_packets(
902902

903903
}
904904

905-
void enc1_stream_encoder_reset_fifo(
906-
struct stream_encoder *enc)
907-
{
908-
struct dcn10_stream_encoder *enc1 = DCN10STRENC_FROM_STRENC(enc);
909-
910-
/* set DIG_START to 0x1 to reset FIFO */
911-
REG_UPDATE(DIG_FE_CNTL, DIG_START, 1);
912-
udelay(100);
913-
914-
/* write 0 to take the FIFO out of reset */
915-
REG_UPDATE(DIG_FE_CNTL, DIG_START, 0);
916-
}
917-
918905
void enc1_stream_encoder_dp_blank(
919906
struct dc_link *link,
920907
struct stream_encoder *enc)
@@ -1600,8 +1587,6 @@ static const struct stream_encoder_funcs dcn10_str_enc_funcs = {
16001587
enc1_stream_encoder_send_immediate_sdp_message,
16011588
.stop_dp_info_packets =
16021589
enc1_stream_encoder_stop_dp_info_packets,
1603-
.reset_fifo =
1604-
enc1_stream_encoder_reset_fifo,
16051590
.dp_blank =
16061591
enc1_stream_encoder_dp_blank,
16071592
.dp_unblank =

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

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -626,9 +626,6 @@ void enc1_stream_encoder_send_immediate_sdp_message(
626626
void enc1_stream_encoder_stop_dp_info_packets(
627627
struct stream_encoder *enc);
628628

629-
void enc1_stream_encoder_reset_fifo(
630-
struct stream_encoder *enc);
631-
632629
void enc1_stream_encoder_dp_blank(
633630
struct dc_link *link,
634631
struct stream_encoder *enc);

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -593,8 +593,6 @@ static const struct stream_encoder_funcs dcn20_str_enc_funcs = {
593593
enc1_stream_encoder_send_immediate_sdp_message,
594594
.stop_dp_info_packets =
595595
enc1_stream_encoder_stop_dp_info_packets,
596-
.reset_fifo =
597-
enc1_stream_encoder_reset_fifo,
598596
.dp_blank =
599597
enc1_stream_encoder_dp_blank,
600598
.dp_unblank =

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -789,8 +789,6 @@ static const struct stream_encoder_funcs dcn30_str_enc_funcs = {
789789
enc3_stream_encoder_update_dp_info_packets,
790790
.stop_dp_info_packets =
791791
enc1_stream_encoder_stop_dp_info_packets,
792-
.reset_fifo =
793-
enc1_stream_encoder_reset_fifo,
794792
.dp_blank =
795793
enc1_stream_encoder_dp_blank,
796794
.dp_unblank =

drivers/gpu/drm/amd/display/dc/inc/hw/stream_encoder.h

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -164,10 +164,6 @@ struct stream_encoder_funcs {
164164
void (*stop_dp_info_packets)(
165165
struct stream_encoder *enc);
166166

167-
void (*reset_fifo)(
168-
struct stream_encoder *enc
169-
);
170-
171167
void (*dp_blank)(
172168
struct dc_link *link,
173169
struct stream_encoder *enc);

0 commit comments

Comments
 (0)