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

Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git

kernel os linux

[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 <daniel.wheeler@amd.com>
Reviewed-by: Charlene Liu <Charlene.Liu@amd.com>
Acked-by: Stylon Wang <stylon.wang@amd.com>
Signed-off-by: Zhan Liu <Zhan.Liu@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Cc: stable@vger.kernel.org

authored by

Zhan Liu and committed by

Alex Deucher 4 years ago 49a6ebb9 f5fa54f4

-31

6 changed files

expand all

drivers

gpu

drm

amd

display

dce110

dce110_hw_sequencer.c

dcn10

dcn10_stream_encoder.c

dcn10_stream_encoder.h

dcn20

dcn20_stream_encoder.c

dcn30

dcn30_dio_stream_encoder.c

inc

stream_encoder.h

-5

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

··· 1608 1608 pipe_ctx->stream_res.stream_enc, 1609 1609 pipe_ctx->stream_res.tg->inst); 1610 1610 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 - 1616 1611 if (dc_is_dp_signal(pipe_ctx->stream->signal)) 1617 1612 dp_source_sequence_trace(link, DPCD_SOURCE_SEQ_AFTER_CONNECT_DIG_FE_OTG); 1618 1613

-15

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

··· 902 902 903 903 } 904 904 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 - 918 905 void enc1_stream_encoder_dp_blank( 919 906 struct dc_link *link, 920 907 struct stream_encoder *enc) ··· 1587 1600 enc1_stream_encoder_send_immediate_sdp_message, 1588 1601 .stop_dp_info_packets = 1589 1602 enc1_stream_encoder_stop_dp_info_packets, 1590 - .reset_fifo = 1591 - enc1_stream_encoder_reset_fifo, 1592 1603 .dp_blank = 1593 1604 enc1_stream_encoder_dp_blank, 1594 1605 .dp_unblank =

-3

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

··· 626 626 void enc1_stream_encoder_stop_dp_info_packets( 627 627 struct stream_encoder *enc); 628 628 629 - void enc1_stream_encoder_reset_fifo( 630 - struct stream_encoder *enc); 631 - 632 629 void enc1_stream_encoder_dp_blank( 633 630 struct dc_link *link, 634 631 struct stream_encoder *enc);

-2

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

··· 593 593 enc1_stream_encoder_send_immediate_sdp_message, 594 594 .stop_dp_info_packets = 595 595 enc1_stream_encoder_stop_dp_info_packets, 596 - .reset_fifo = 597 - enc1_stream_encoder_reset_fifo, 598 596 .dp_blank = 599 597 enc1_stream_encoder_dp_blank, 600 598 .dp_unblank =

-2

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

··· 789 789 enc3_stream_encoder_update_dp_info_packets, 790 790 .stop_dp_info_packets = 791 791 enc1_stream_encoder_stop_dp_info_packets, 792 - .reset_fifo = 793 - enc1_stream_encoder_reset_fifo, 794 792 .dp_blank = 795 793 enc1_stream_encoder_dp_blank, 796 794 .dp_unblank =

-4

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

··· 164 164 void (*stop_dp_info_packets)( 165 165 struct stream_encoder *enc); 166 166 167 - void (*reset_fifo)( 168 - struct stream_encoder *enc 169 - ); 170 - 171 167 void (*dp_blank)( 172 168 struct dc_link *link, 173 169 struct stream_encoder *enc);