diff options
Diffstat (limited to 'meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/2629-drm-amd-display-Use-constants-from-atom.h-for-HDMI-c.patch')
| -rw-r--r-- | meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/2629-drm-amd-display-Use-constants-from-atom.h-for-HDMI-c.patch | 58 |
1 files changed, 58 insertions, 0 deletions
diff --git a/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/2629-drm-amd-display-Use-constants-from-atom.h-for-HDMI-c.patch b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/2629-drm-amd-display-Use-constants-from-atom.h-for-HDMI-c.patch new file mode 100644 index 00000000..4cd93424 --- /dev/null +++ b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/2629-drm-amd-display-Use-constants-from-atom.h-for-HDMI-c.patch @@ -0,0 +1,58 @@ +From fe254dac0e275163e692b0cb188db23f6a734431 Mon Sep 17 00:00:00 2001 +From: Andrew Jiang <Andrew.Jiang@amd.com> +Date: Fri, 20 Oct 2017 16:40:45 -0400 +Subject: [PATCH 2629/4131] drm/amd/display: Use constants from atom.h for HDMI + caps read + +Get rid of the constant we copied over before and just directly use the +constants from the file. + +Signed-off-by: Andrew Jiang <Andrew.Jiang@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> +--- + drivers/gpu/drm/amd/display/dc/core/dc_link.c | 6 +++--- + 1 file changed, 3 insertions(+), 3 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 c47da64..e70612e 100644 +--- a/drivers/gpu/drm/amd/display/dc/core/dc_link.c ++++ b/drivers/gpu/drm/amd/display/dc/core/dc_link.c +@@ -24,6 +24,7 @@ + */ + + #include "dm_services.h" ++#include "atom.h" + #include "dm_helpers.h" + #include "dc.h" + #include "grph_object_id.h" +@@ -45,7 +46,6 @@ + #include "dce/dce_11_0_enum.h" + #include "dce/dce_11_0_sh_mask.h" + +-#define EXT_DISPLAY_PATH_CAPS__EXT_CHIP_MASK 0x007C /* Copied from atombios.h */ + #define LINK_INFO(...) \ + dm_logger_write(dc_ctx->logger, LOG_HW_HOTPLUG, \ + __VA_ARGS__) +@@ -1696,7 +1696,7 @@ static void enable_link_hdmi(struct pipe_ctx *pipe_ctx) + if (dc_is_hdmi_signal(pipe_ctx->stream->signal)) { + unsigned short masked_chip_caps = pipe_ctx->stream->sink->link->chip_caps & + EXT_DISPLAY_PATH_CAPS__EXT_CHIP_MASK; +- if (masked_chip_caps == (0x2 << 2)) { ++ if (masked_chip_caps == EXT_DISPLAY_PATH_CAPS__HDMI20_TISN65DP159RSBT) { + /* DP159, Retimer settings */ + eng_id = pipe_ctx->stream_res.stream_enc->id; + +@@ -1707,7 +1707,7 @@ static void enable_link_hdmi(struct pipe_ctx *pipe_ctx) + write_i2c_default_retimer_setting(pipe_ctx, + is_vga_mode, is_over_340mhz); + } +- } else if (masked_chip_caps == (0x1 << 2)) { ++ } else if (masked_chip_caps == EXT_DISPLAY_PATH_CAPS__HDMI20_PI3EQX1204) { + /* PI3EQX1204, Redriver settings */ + write_i2c_redriver_setting(pipe_ctx, is_over_340mhz); + } +-- +2.7.4 + |