GitHub-Mirror/Star64_linux
2
0
Fork 0
mirror of https://github.com/Fishwaldo/Star64_linux.git synced 2025-07-08 15:33:47 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

drm/amd/display: Pass signal directly to enable_tmds_output

Browse source 
This makes the check for HDMI and dual-link DVI a bit more
straightforward.

Signed-off-by: Harry Wentland <harry.wentland@amd.com>
Reviewed-by: Tony Cheng <Tony.Cheng@amd.com>
Acked-by: Harry Wentland <harry.wentland@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
This commit is contained in:
Harry Wentland 2017-12-18 11:57:28 -05:00 • committed by Alex Deucher
parent 0b395ddbce
commit 35c4c88ce8
5 changed files with 9 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1749,8 +1749,7 @@ static void enable_link_hdmi(struct pipe_ctx *pipe_ctx)
link->link_enc, link->link_enc,
pipe_ctx->clock_source->id, pipe_ctx->clock_source->id,
display_color_depth, display_color_depth,
pipe_ctx->stream->signal == SIGNAL_TYPE_HDMI_TYPE_A, pipe_ctx->stream->signal,
pipe_ctx->stream->signal == SIGNAL_TYPE_DVI_DUAL_LINK,
stream->phy_pix_clk); stream->phy_pix_clk);
if (pipe_ctx->stream->signal == SIGNAL_TYPE_HDMI_TYPE_A) if (pipe_ctx->stream->signal == SIGNAL_TYPE_HDMI_TYPE_A)

15
drivers/gpu/drm/amd/display/dc/dce/dce_link_encoder.c
View file

@ -907,8 +907,7 @@ void dce110_link_encoder_enable_tmds_output(
struct link_encoder *enc, struct link_encoder *enc,
enum clock_source_id clock_source, enum clock_source_id clock_source,
enum dc_color_depth color_depth, enum dc_color_depth color_depth,
bool hdmi, enum signal_type signal,
bool dual_link,
uint32_t pixel_clock) uint32_t pixel_clock)
{ {
struct dce110_link_encoder *enc110 = TO_DCE110_LINK_ENC(enc); struct dce110_link_encoder *enc110 = TO_DCE110_LINK_ENC(enc);
@ -922,16 +921,12 @@ void dce110_link_encoder_enable_tmds_output(
cntl.engine_id = enc->preferred_engine; cntl.engine_id = enc->preferred_engine;
cntl.transmitter = enc110->base.transmitter; cntl.transmitter = enc110->base.transmitter;
cntl.pll_id = clock_source; cntl.pll_id = clock_source;
if (hdmi) { cntl.signal = signal;
cntl.signal = SIGNAL_TYPE_HDMI_TYPE_A; if (cntl.signal == SIGNAL_TYPE_DVI_DUAL_LINK)
cntl.lanes_number = 4;
} else if (dual_link) {
cntl.signal = SIGNAL_TYPE_DVI_DUAL_LINK;
cntl.lanes_number = 8; cntl.lanes_number = 8;
} else { else
cntl.signal = SIGNAL_TYPE_DVI_SINGLE_LINK;
cntl.lanes_number = 4; cntl.lanes_number = 4;
}
cntl.hpd_sel = enc110->base.hpd_source; cntl.hpd_sel = enc110->base.hpd_source;
cntl.pixel_clock = pixel_clock; cntl.pixel_clock = pixel_clock;

3
drivers/gpu/drm/amd/display/dc/dce/dce_link_encoder.h
View file

@ -210,8 +210,7 @@ void dce110_link_encoder_enable_tmds_output(
struct link_encoder *enc, struct link_encoder *enc,
enum clock_source_id clock_source, enum clock_source_id clock_source,
enum dc_color_depth color_depth, enum dc_color_depth color_depth,
bool hdmi, enum signal_type signal,
bool dual_link,
uint32_t pixel_clock); uint32_t pixel_clock);
/* enables DP PHY output */ /* enables DP PHY output */

3
drivers/gpu/drm/amd/display/dc/inc/hw/link_encoder.h
View file

@ -123,8 +123,7 @@ struct link_encoder_funcs {
void (*enable_tmds_output)(struct link_encoder *enc, void (*enable_tmds_output)(struct link_encoder *enc,
enum clock_source_id clock_source, enum clock_source_id clock_source,
enum dc_color_depth color_depth, enum dc_color_depth color_depth,
bool hdmi, enum signal_type signal,
bool dual_link,
uint32_t pixel_clock); uint32_t pixel_clock);
void (*enable_dp_output)(struct link_encoder *enc, void (*enable_dp_output)(struct link_encoder *enc,
const struct dc_link_settings *link_settings, const struct dc_link_settings *link_settings,

3
drivers/gpu/drm/amd/display/dc/virtual/virtual_link_encoder.c
View file

@ -42,8 +42,7 @@ static void virtual_link_encoder_enable_tmds_output(
struct link_encoder *enc, struct link_encoder *enc,
enum clock_source_id clock_source, enum clock_source_id clock_source,
enum dc_color_depth color_depth, enum dc_color_depth color_depth,
bool hdmi, enum signal_type signal,
bool dual_link,
uint32_t pixel_clock) {} uint32_t pixel_clock) {}
static void virtual_link_encoder_enable_dp_output( static void virtual_link_encoder_enable_dp_output(