[PATCH 11/18] drm/amd/display: Make it more clear when info frames affect DP or HDMI

[Harry Wentland]

From: Krunoslav Kovac <krunoslav.ko...@amd.com>

Signed-off-by: Harry Wentland <harry.wentl...@amd.com>
Signed-off-by: Krunoslav Kovac <krunoslav.ko...@amd.com>
Reviewed-by: Anthony Koo <anthony....@amd.com>
---
 .../drm/amd/display/dc/dce110/dce110_hw_sequencer.c | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

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 59e2bbf4d676..9f3b969b5a0e 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
@@ -667,16 +667,25 @@ static enum dc_status bios_parser_crtc_source_select(
 
 void dce110_update_info_frame(struct pipe_ctx *pipe_ctx)
 {
+       bool is_hdmi;
+       bool is_dp;
+
        ASSERT(pipe_ctx->stream);
 
        if (pipe_ctx->stream_res.stream_enc == NULL)
                return;  /* this is not root pipe */
 
-       if (dc_is_hdmi_signal(pipe_ctx->stream->signal))
+       is_hdmi = dc_is_hdmi_signal(pipe_ctx->stream->signal);
+       is_dp = dc_is_dp_signal(pipe_ctx->stream->signal);
+
+       if (!is_hdmi && !is_dp)
+               return;
+
+       if (is_hdmi)
                
pipe_ctx->stream_res.stream_enc->funcs->update_hdmi_info_packets(
                        pipe_ctx->stream_res.stream_enc,
                        &pipe_ctx->stream_res.encoder_info_frame);
-       else if (dc_is_dp_signal(pipe_ctx->stream->signal))
+       else
                pipe_ctx->stream_res.stream_enc->funcs->update_dp_info_packets(
                        pipe_ctx->stream_res.stream_enc,
                        &pipe_ctx->stream_res.encoder_info_frame);
-- 
2.17.0

_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx