]> git.proxmox.com Git - mirror_ubuntu-hirsute-kernel.git/commitdiff
drm/amd/display: Use parameter for call to set output mux
authorEric Bernstein <eric.bernstein@amd.com>
Mon, 20 Jul 2020 23:18:43 +0000 (19:18 -0400)
committerAlex Deucher <alexander.deucher@amd.com>
Thu, 6 Aug 2020 20:46:58 +0000 (16:46 -0400)
Signed-off-by: Eric Bernstein <eric.bernstein@amd.com>
Reviewed-by: Chris Park <Chris.Park@amd.com>
Acked-by: Aurabindo Pillai <aurabindo.pillai@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
drivers/gpu/drm/amd/display/dc/core/dc_link.c

index 02742cca4d8459dd0c661206c89a1a249326dc48..9f8ab679616c102d467bce496645349577efc203 100644 (file)
@@ -3102,6 +3102,9 @@ void core_link_enable_stream(
        struct dc *dc = pipe_ctx->stream->ctx->dc;
        struct dc_stream_state *stream = pipe_ctx->stream;
        enum dc_status status;
+#if defined(CONFIG_DRM_AMD_DC_DCN3_0)
+       enum otg_out_mux_dest otg_out_dest = OUT_MUX_DIO;
+#endif
        DC_LOGGER_INIT(pipe_ctx->stream->ctx->logger);
 
        if (!IS_DIAG_DC(dc->ctx->dce_environment) &&
@@ -3136,8 +3139,8 @@ void core_link_enable_stream(
        pipe_ctx->stream->link->link_state_valid = true;
 
 #if defined(CONFIG_DRM_AMD_DC_DCN3_0)
-               if (pipe_ctx->stream_res.tg->funcs->set_out_mux)
-                                       pipe_ctx->stream_res.tg->funcs->set_out_mux(pipe_ctx->stream_res.tg, OUT_MUX_DIO);
+       if (pipe_ctx->stream_res.tg->funcs->set_out_mux)
+               pipe_ctx->stream_res.tg->funcs->set_out_mux(pipe_ctx->stream_res.tg, otg_out_dest);
 #endif
 
        if (dc_is_dvi_signal(pipe_ctx->stream->signal))