Skip to content

Commit 707f66d

Browse files
committed
drivers/gpu/drm/amd/display/dc/link/link_dpms.c: set otg_out_mux correctly for <DCN4
1 parent 29a1f33 commit 707f66d

2 files changed

Lines changed: 6 additions & 1 deletion

File tree

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -106,6 +106,7 @@ enum crc_selection {
106106

107107
enum otg_out_mux_dest {
108108
OUT_MUX_DIO = 0,
109+
OUT_MUX_HPO_HDMI = 1,
109110
OUT_MUX_HPO_DP = 2,
110111
};
111112

drivers/gpu/drm/amd/display/dc/link/link_dpms.c

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2492,8 +2492,12 @@ void link_set_dpms_on(
24922492
pipe_ctx->stream->link->link_state_valid = true;
24932493

24942494
if (pipe_ctx->stream_res.tg->funcs->set_out_mux) {
2495-
if (dp_is_128b_132b_signal(pipe_ctx) || dc_is_hdmi_frl_signal(pipe_ctx->stream->signal))
2495+
if (dp_is_128b_132b_signal(pipe_ctx))
24962496
otg_out_dest = OUT_MUX_HPO_DP;
2497+
else if (dc_is_hdmi_frl_signal(pipe_ctx->stream->signal))
2498+
/* DCN401 unified the DP and HDMI output mux values */
2499+
otg_out_dest = (dc->ctx->dce_version < DCN_VERSION_4_01) ?
2500+
OUT_MUX_HPO_HDMI : OUT_MUX_HPO_DP;
24972501
else
24982502
otg_out_dest = OUT_MUX_DIO;
24992503
pipe_ctx->stream_res.tg->funcs->set_out_mux(pipe_ctx->stream_res.tg, otg_out_dest);

0 commit comments

Comments
 (0)