diff options
Diffstat (limited to 'common/recipes-kernel/linux/linux-yocto-4.19.8/1590-drm-amd-display-Rename-is_hdmi-to-is_hdmi_tmds-type.patch')
| -rw-r--r-- | common/recipes-kernel/linux/linux-yocto-4.19.8/1590-drm-amd-display-Rename-is_hdmi-to-is_hdmi_tmds-type.patch | 101 |
1 files changed, 101 insertions, 0 deletions
diff --git a/common/recipes-kernel/linux/linux-yocto-4.19.8/1590-drm-amd-display-Rename-is_hdmi-to-is_hdmi_tmds-type.patch b/common/recipes-kernel/linux/linux-yocto-4.19.8/1590-drm-amd-display-Rename-is_hdmi-to-is_hdmi_tmds-type.patch new file mode 100644 index 00000000..87072e31 --- /dev/null +++ b/common/recipes-kernel/linux/linux-yocto-4.19.8/1590-drm-amd-display-Rename-is_hdmi-to-is_hdmi_tmds-type.patch @@ -0,0 +1,101 @@ +From 2f0d6355ebd05c7ea780d7713ee268c20bb5f2c3 Mon Sep 17 00:00:00 2001 +From: Eric Bernstein <eric.bernstein@amd.com> +Date: Fri, 15 Feb 2019 09:27:22 -0500 +Subject: [PATCH 1590/2940] drm/amd/display: Rename is_hdmi to is_hdmi_tmds + type + +HDMI has TMDS and FRL signal types. Be specific about what is used. + +Signed-off-by: Eric Bernstein <eric.bernstein@amd.com> +Reviewed-by: Nevenko Stupar <Nevenko.Stupar@amd.com> +Reviewed-by: Tony Cheng <Tony.Cheng@amd.com> +Acked-by: Leo Li <sunpeng.li@amd.com> +--- + drivers/gpu/drm/amd/display/dc/core/dc_link.c | 2 +- + .../amd/display/dc/dce110/dce110_hw_sequencer.c | 15 ++++++++------- + .../gpu/drm/amd/display/include/signal_types.h | 5 +++++ + 3 files changed, 14 insertions(+), 8 deletions(-) + +diff --git a/drivers/gpu/drm/amd/display/dc/core/dc_link.c b/drivers/gpu/drm/amd/display/dc/core/dc_link.c +index c11f878d7b9f..3dd698a8367d 100644 +--- a/drivers/gpu/drm/amd/display/dc/core/dc_link.c ++++ b/drivers/gpu/drm/amd/display/dc/core/dc_link.c +@@ -2579,7 +2579,7 @@ void core_link_enable_stream( + &stream->timing, + stream->output_color_space); + +- if (dc_is_hdmi_signal(pipe_ctx->stream->signal)) ++ if (dc_is_hdmi_tmds_signal(pipe_ctx->stream->signal)) + pipe_ctx->stream_res.stream_enc->funcs->hdmi_set_stream_attribute( + pipe_ctx->stream_res.stream_enc, + &stream->timing, +diff --git a/drivers/gpu/drm/amd/display/dc/dce110/dce110_hw_sequencer.c b/drivers/gpu/drm/amd/display/dc/dce110/dce110_hw_sequencer.c +index 508754af50fb..c16376a3b788 100644 +--- a/drivers/gpu/drm/amd/display/dc/dce110/dce110_hw_sequencer.c ++++ b/drivers/gpu/drm/amd/display/dc/dce110/dce110_hw_sequencer.c +@@ -616,7 +616,7 @@ dce110_set_output_transfer_func(struct pipe_ctx *pipe_ctx, + + void dce110_update_info_frame(struct pipe_ctx *pipe_ctx) + { +- bool is_hdmi; ++ bool is_hdmi_tmds; + bool is_dp; + + ASSERT(pipe_ctx->stream); +@@ -624,13 +624,13 @@ void dce110_update_info_frame(struct pipe_ctx *pipe_ctx) + if (pipe_ctx->stream_res.stream_enc == NULL) + return; /* this is not root pipe */ + +- is_hdmi = dc_is_hdmi_signal(pipe_ctx->stream->signal); ++ is_hdmi_tmds = dc_is_hdmi_tmds_signal(pipe_ctx->stream->signal); + is_dp = dc_is_dp_signal(pipe_ctx->stream->signal); + +- if (!is_hdmi && !is_dp) ++ if (!is_hdmi_tmds && !is_dp) + return; + +- if (is_hdmi) ++ if (is_hdmi_tmds) + pipe_ctx->stream_res.stream_enc->funcs->update_hdmi_info_packets( + pipe_ctx->stream_res.stream_enc, + &pipe_ctx->stream_res.encoder_info_frame); +@@ -974,8 +974,9 @@ void dce110_enable_audio_stream(struct pipe_ctx *pipe_ctx) + set_pme_wa_enable_by_version(core_dc); + /* un-mute audio */ + /* TODO: audio should be per stream rather than per link */ +- pipe_ctx->stream_res.stream_enc->funcs->audio_mute_control( +- pipe_ctx->stream_res.stream_enc, false); ++ if (dc_is_hdmi_tmds_signal(pipe_ctx->stream->signal)) ++ pipe_ctx->stream_res.stream_enc->funcs->audio_mute_control( ++ pipe_ctx->stream_res.stream_enc, false); + } + } + +@@ -1026,7 +1027,7 @@ void dce110_disable_stream(struct pipe_ctx *pipe_ctx, int option) + struct dc_link *link = stream->link; + struct dc *dc = pipe_ctx->stream->ctx->dc; + +- if (dc_is_hdmi_signal(pipe_ctx->stream->signal)) ++ if (dc_is_hdmi_tmds_signal(pipe_ctx->stream->signal)) + pipe_ctx->stream_res.stream_enc->funcs->stop_hdmi_info_packets( + pipe_ctx->stream_res.stream_enc); + +diff --git a/drivers/gpu/drm/amd/display/include/signal_types.h b/drivers/gpu/drm/amd/display/include/signal_types.h +index f56d2891475f..beed70179bb5 100644 +--- a/drivers/gpu/drm/amd/display/include/signal_types.h ++++ b/drivers/gpu/drm/amd/display/include/signal_types.h +@@ -45,6 +45,11 @@ enum signal_type { + }; + + /* help functions for signal types manipulation */ ++static inline bool dc_is_hdmi_tmds_signal(enum signal_type signal) ++{ ++ return (signal == SIGNAL_TYPE_HDMI_TYPE_A); ++} ++ + static inline bool dc_is_hdmi_signal(enum signal_type signal) + { + return (signal == SIGNAL_TYPE_HDMI_TYPE_A); +-- +2.17.1 + |