public-mirrors/linux
1
0
Fork 0
mirror of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-11-14 02:04:43 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

drm/amd/display: Rename is_hdmi to is_hdmi_tmds type

Browse source 
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>
This commit is contained in:
Eric Bernstein 2019-02-15 09:27:22 -05:00 • committed by Alex Deucher
parent e6bddf6c67
commit 02553f57dc
3 changed files with 14 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
drivers/gpu/drm/amd/display/dc/core/dc_link.c
View file

@ -2579,7 +2579,7 @@ void core_link_enable_stream(
&stream->timing, &stream->timing,
stream->output_color_space); 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->funcs->hdmi_set_stream_attribute(
pipe_ctx->stream_res.stream_enc, pipe_ctx->stream_res.stream_enc,
&stream->timing, &stream->timing,

15
drivers/gpu/drm/amd/display/dc/dce110/dce110_hw_sequencer.c
View file

@ -616,7 +616,7 @@ dce110_set_output_transfer_func(struct pipe_ctx *pipe_ctx,
void dce110_update_info_frame(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; bool is_dp;
ASSERT(pipe_ctx->stream); 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) if (pipe_ctx->stream_res.stream_enc == NULL)
return; /* this is not root pipe */ 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); is_dp = dc_is_dp_signal(pipe_ctx->stream->signal);
if (!is_hdmi && !is_dp) if (!is_hdmi_tmds && !is_dp)
return; 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->funcs->update_hdmi_info_packets(
pipe_ctx->stream_res.stream_enc, pipe_ctx->stream_res.stream_enc,
&pipe_ctx->stream_res.encoder_info_frame); &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); set_pme_wa_enable_by_version(core_dc);
/* un-mute audio */ /* un-mute audio */
/* TODO: audio should be per stream rather than per link */ /* TODO: audio should be per stream rather than per link */
pipe_ctx->stream_res.stream_enc->funcs->audio_mute_control( if (dc_is_hdmi_tmds_signal(pipe_ctx->stream->signal))
pipe_ctx->stream_res.stream_enc, false); 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_link *link = stream->link;
struct dc *dc = pipe_ctx->stream->ctx->dc; 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->funcs->stop_hdmi_info_packets(
pipe_ctx->stream_res.stream_enc); pipe_ctx->stream_res.stream_enc);

5
drivers/gpu/drm/amd/display/include/signal_types.h
View file

@ -45,6 +45,11 @@ enum signal_type {
}; };
/* help functions for signal types manipulation */ /* 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) static inline bool dc_is_hdmi_signal(enum signal_type signal)
{ {
return (signal == SIGNAL_TYPE_HDMI_TYPE_A); return (signal == SIGNAL_TYPE_HDMI_TYPE_A);