drm/amd/display: Rename is_hdmi to is_hdmi_tmds type

Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git

kernel os linux

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>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

authored by

Eric Bernstein and committed by

Alex Deucher 7 years ago 02553f57 e6bddf6c

+14 -8

3 changed files

expand all

drivers

gpu

drm

amd

display

core

dc_link.c

dce110

dce110_hw_sequencer.c

include

signal_types.h

+1 -1

drivers/gpu/drm/amd/display/dc/core/dc_link.c

··· 2579 2579 &stream->timing, 2580 2580 stream->output_color_space); 2581 2581 2582 - if (dc_is_hdmi_signal(pipe_ctx->stream->signal)) 2582 + if (dc_is_hdmi_tmds_signal(pipe_ctx->stream->signal)) 2583 2583 pipe_ctx->stream_res.stream_enc->funcs->hdmi_set_stream_attribute( 2584 2584 pipe_ctx->stream_res.stream_enc, 2585 2585 &stream->timing,

+8 -7

drivers/gpu/drm/amd/display/dc/dce110/dce110_hw_sequencer.c

··· 616 616 617 617 void dce110_update_info_frame(struct pipe_ctx *pipe_ctx) 618 618 { 619 - bool is_hdmi; 619 + bool is_hdmi_tmds; 620 620 bool is_dp; 621 621 622 622 ASSERT(pipe_ctx->stream); ··· 624 624 if (pipe_ctx->stream_res.stream_enc == NULL) 625 625 return; /* this is not root pipe */ 626 626 627 - is_hdmi = dc_is_hdmi_signal(pipe_ctx->stream->signal); 627 + is_hdmi_tmds = dc_is_hdmi_tmds_signal(pipe_ctx->stream->signal); 628 628 is_dp = dc_is_dp_signal(pipe_ctx->stream->signal); 629 629 630 - if (!is_hdmi && !is_dp) 630 + if (!is_hdmi_tmds && !is_dp) 631 631 return; 632 632 633 - if (is_hdmi) 633 + if (is_hdmi_tmds) 634 634 pipe_ctx->stream_res.stream_enc->funcs->update_hdmi_info_packets( 635 635 pipe_ctx->stream_res.stream_enc, 636 636 &pipe_ctx->stream_res.encoder_info_frame); ··· 974 974 set_pme_wa_enable_by_version(core_dc); 975 975 /* un-mute audio */ 976 976 /* TODO: audio should be per stream rather than per link */ 977 - pipe_ctx->stream_res.stream_enc->funcs->audio_mute_control( 978 - pipe_ctx->stream_res.stream_enc, false); 977 + if (dc_is_hdmi_tmds_signal(pipe_ctx->stream->signal)) 978 + pipe_ctx->stream_res.stream_enc->funcs->audio_mute_control( 979 + pipe_ctx->stream_res.stream_enc, false); 979 980 } 980 981 } 981 982 ··· 1027 1026 struct dc_link *link = stream->link; 1028 1027 struct dc *dc = pipe_ctx->stream->ctx->dc; 1029 1028 1030 - if (dc_is_hdmi_signal(pipe_ctx->stream->signal)) 1029 + if (dc_is_hdmi_tmds_signal(pipe_ctx->stream->signal)) 1031 1030 pipe_ctx->stream_res.stream_enc->funcs->stop_hdmi_info_packets( 1032 1031 pipe_ctx->stream_res.stream_enc); 1033 1032

drivers/gpu/drm/amd/display/include/signal_types.h

··· 45 45 }; 46 46 47 47 /* help functions for signal types manipulation */ 48 + static inline bool dc_is_hdmi_tmds_signal(enum signal_type signal) 49 + { 50 + return (signal == SIGNAL_TYPE_HDMI_TYPE_A); 51 + } 52 + 48 53 static inline bool dc_is_hdmi_signal(enum signal_type signal) 49 54 { 50 55 return (signal == SIGNAL_TYPE_HDMI_TYPE_A);