diff options
Diffstat (limited to 'meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/3104-drm-amd-display-Pass-signal-directly-to-enable_tmds_.patch')
| -rw-r--r-- | meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/3104-drm-amd-display-Pass-signal-directly-to-enable_tmds_.patch | 114 |
1 files changed, 114 insertions, 0 deletions
diff --git a/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/3104-drm-amd-display-Pass-signal-directly-to-enable_tmds_.patch b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/3104-drm-amd-display-Pass-signal-directly-to-enable_tmds_.patch new file mode 100644 index 00000000..879b26c6 --- /dev/null +++ b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/3104-drm-amd-display-Pass-signal-directly-to-enable_tmds_.patch @@ -0,0 +1,114 @@ +From 896811aa67d2cdf88037a7828630120c7131ccaf Mon Sep 17 00:00:00 2001 +From: Harry Wentland <harry.wentland@amd.com> +Date: Mon, 18 Dec 2017 11:57:28 -0500 +Subject: [PATCH 3104/4131] drm/amd/display: Pass signal directly to + enable_tmds_output + +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> +--- + drivers/gpu/drm/amd/display/dc/core/dc_link.c | 3 +-- + drivers/gpu/drm/amd/display/dc/dce/dce_link_encoder.c | 15 +++++---------- + drivers/gpu/drm/amd/display/dc/dce/dce_link_encoder.h | 3 +-- + drivers/gpu/drm/amd/display/dc/inc/hw/link_encoder.h | 3 +-- + .../gpu/drm/amd/display/dc/virtual/virtual_link_encoder.c | 3 +-- + 5 files changed, 9 insertions(+), 18 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 2b791b2..0d8211a 100644 +--- a/drivers/gpu/drm/amd/display/dc/core/dc_link.c ++++ b/drivers/gpu/drm/amd/display/dc/core/dc_link.c +@@ -1749,8 +1749,7 @@ static void enable_link_hdmi(struct pipe_ctx *pipe_ctx) + link->link_enc, + pipe_ctx->clock_source->id, + display_color_depth, +- pipe_ctx->stream->signal == SIGNAL_TYPE_HDMI_TYPE_A, +- pipe_ctx->stream->signal == SIGNAL_TYPE_DVI_DUAL_LINK, ++ pipe_ctx->stream->signal, + stream->phy_pix_clk); + + if (pipe_ctx->stream->signal == SIGNAL_TYPE_HDMI_TYPE_A) +diff --git a/drivers/gpu/drm/amd/display/dc/dce/dce_link_encoder.c b/drivers/gpu/drm/amd/display/dc/dce/dce_link_encoder.c +index 9a12135..319442f 100644 +--- a/drivers/gpu/drm/amd/display/dc/dce/dce_link_encoder.c ++++ b/drivers/gpu/drm/amd/display/dc/dce/dce_link_encoder.c +@@ -897,8 +897,7 @@ void dce110_link_encoder_enable_tmds_output( + struct link_encoder *enc, + enum clock_source_id clock_source, + enum dc_color_depth color_depth, +- bool hdmi, +- bool dual_link, ++ enum signal_type signal, + uint32_t pixel_clock) + { + struct dce110_link_encoder *enc110 = TO_DCE110_LINK_ENC(enc); +@@ -912,16 +911,12 @@ void dce110_link_encoder_enable_tmds_output( + cntl.engine_id = enc->preferred_engine; + cntl.transmitter = enc110->base.transmitter; + cntl.pll_id = clock_source; +- if (hdmi) { +- cntl.signal = SIGNAL_TYPE_HDMI_TYPE_A; +- cntl.lanes_number = 4; +- } else if (dual_link) { +- cntl.signal = SIGNAL_TYPE_DVI_DUAL_LINK; ++ cntl.signal = signal; ++ if (cntl.signal == SIGNAL_TYPE_DVI_DUAL_LINK) + cntl.lanes_number = 8; +- } else { +- cntl.signal = SIGNAL_TYPE_DVI_SINGLE_LINK; ++ else + cntl.lanes_number = 4; +- } ++ + cntl.hpd_sel = enc110->base.hpd_source; + + cntl.pixel_clock = pixel_clock; +diff --git a/drivers/gpu/drm/amd/display/dc/dce/dce_link_encoder.h b/drivers/gpu/drm/amd/display/dc/dce/dce_link_encoder.h +index 8ca9afe..0ec3433 100644 +--- a/drivers/gpu/drm/amd/display/dc/dce/dce_link_encoder.h ++++ b/drivers/gpu/drm/amd/display/dc/dce/dce_link_encoder.h +@@ -210,8 +210,7 @@ void dce110_link_encoder_enable_tmds_output( + struct link_encoder *enc, + enum clock_source_id clock_source, + enum dc_color_depth color_depth, +- bool hdmi, +- bool dual_link, ++ enum signal_type signal, + uint32_t pixel_clock); + + /* enables DP PHY output */ +diff --git a/drivers/gpu/drm/amd/display/dc/inc/hw/link_encoder.h b/drivers/gpu/drm/amd/display/dc/inc/hw/link_encoder.h +index 8a08f0a..fe7b36b 100644 +--- a/drivers/gpu/drm/amd/display/dc/inc/hw/link_encoder.h ++++ b/drivers/gpu/drm/amd/display/dc/inc/hw/link_encoder.h +@@ -101,8 +101,7 @@ struct link_encoder_funcs { + void (*enable_tmds_output)(struct link_encoder *enc, + enum clock_source_id clock_source, + enum dc_color_depth color_depth, +- bool hdmi, +- bool dual_link, ++ enum signal_type signal, + uint32_t pixel_clock); + void (*enable_dp_output)(struct link_encoder *enc, + const struct dc_link_settings *link_settings, +diff --git a/drivers/gpu/drm/amd/display/dc/virtual/virtual_link_encoder.c b/drivers/gpu/drm/amd/display/dc/virtual/virtual_link_encoder.c +index 57a54a7..1c079ba 100644 +--- a/drivers/gpu/drm/amd/display/dc/virtual/virtual_link_encoder.c ++++ b/drivers/gpu/drm/amd/display/dc/virtual/virtual_link_encoder.c +@@ -42,8 +42,7 @@ static void virtual_link_encoder_enable_tmds_output( + struct link_encoder *enc, + enum clock_source_id clock_source, + enum dc_color_depth color_depth, +- bool hdmi, +- bool dual_link, ++ enum signal_type signal, + uint32_t pixel_clock) {} + + static void virtual_link_encoder_enable_dp_output( +-- +2.7.4 + |