File tree Expand file tree Collapse file tree
drivers/gpu/drm/amd/display/dc Expand file tree Collapse file tree Original file line number Diff line number Diff line change @@ -106,6 +106,7 @@ enum crc_selection {
106106
107107enum otg_out_mux_dest {
108108 OUT_MUX_DIO = 0 ,
109+ OUT_MUX_HPO_HDMI = 1 ,
109110 OUT_MUX_HPO_DP = 2 ,
110111};
111112
Original file line number Diff line number Diff line change @@ -2544,8 +2544,12 @@ void link_set_dpms_on(
25442544 pipe_ctx -> stream -> link -> link_state_valid = true;
25452545
25462546 if (pipe_ctx -> stream_res .tg -> funcs -> set_out_mux ) {
2547- if (dp_is_128b_132b_signal (pipe_ctx ) || dc_is_hdmi_frl_signal ( pipe_ctx -> stream -> signal ) )
2547+ if (dp_is_128b_132b_signal (pipe_ctx ))
25482548 otg_out_dest = OUT_MUX_HPO_DP ;
2549+ else if (dc_is_hdmi_frl_signal (pipe_ctx -> stream -> signal ))
2550+ /* DCN401 unified the DP and HDMI output mux values */
2551+ otg_out_dest = (dc -> ctx -> dce_version < DCN_VERSION_4_01 ) ?
2552+ OUT_MUX_HPO_HDMI : OUT_MUX_HPO_DP ;
25492553 else
25502554 otg_out_dest = OUT_MUX_DIO ;
25512555 pipe_ctx -> stream_res .tg -> funcs -> set_out_mux (pipe_ctx -> stream_res .tg , otg_out_dest );
You can’t perform that action at this time.
0 commit comments