aboutsummaryrefslogtreecommitdiffstats
path: root/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/1005-drm-amd-display-Block-6Ghz-timing-if-SBIOS-set-HDMI_.patch
diff options
context:
space:
mode:
Diffstat (limited to 'meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/1005-drm-amd-display-Block-6Ghz-timing-if-SBIOS-set-HDMI_.patch')
-rw-r--r--meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/1005-drm-amd-display-Block-6Ghz-timing-if-SBIOS-set-HDMI_.patch65
1 files changed, 65 insertions, 0 deletions
diff --git a/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/1005-drm-amd-display-Block-6Ghz-timing-if-SBIOS-set-HDMI_.patch b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/1005-drm-amd-display-Block-6Ghz-timing-if-SBIOS-set-HDMI_.patch
new file mode 100644
index 00000000..8f7d2ad1
--- /dev/null
+++ b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/1005-drm-amd-display-Block-6Ghz-timing-if-SBIOS-set-HDMI_.patch
@@ -0,0 +1,65 @@
+From 19ae9c7ccce21837133aecee300ea35452ed5b6d Mon Sep 17 00:00:00 2001
+From: Charlene Liu <charlene.liu@amd.com>
+Date: Tue, 22 Aug 2017 20:15:28 -0400
+Subject: [PATCH 1005/4131] drm/amd/display: Block 6Ghz timing if SBIOS set
+ HDMI_6G_en to 0
+
+Change-Id: I902f693c9501737c8611c641f589b23fdfe5da50
+Signed-off-by: Charlene Liu <charlene.liu@amd.com>
+Reviewed-by: Charlene Liu <Charlene.Liu@amd.com>
+Acked-by: Harry Wentland <Harry.Wentland@amd.com>
+---
+ drivers/gpu/drm/amd/display/dc/bios/bios_parser.c | 1 +
+ drivers/gpu/drm/amd/display/dc/dce/dce_link_encoder.c | 4 ++++
+ drivers/gpu/drm/amd/display/dc/inc/hw/link_encoder.h | 1 +
+ 3 files changed, 6 insertions(+)
+
+diff --git a/drivers/gpu/drm/amd/display/dc/bios/bios_parser.c b/drivers/gpu/drm/amd/display/dc/bios/bios_parser.c
+index 2c683d4..2c41144 100644
+--- a/drivers/gpu/drm/amd/display/dc/bios/bios_parser.c
++++ b/drivers/gpu/drm/amd/display/dc/bios/bios_parser.c
+@@ -1853,6 +1853,7 @@ static enum bp_result bios_parser_get_encoder_cap_info(
+
+ info->DP_HBR2_EN = record->usHBR2En;
+ info->DP_HBR3_EN = record->usHBR3En;
++ info->HDMI_6GB_EN = record->usHDMI6GEn;
+ return BP_RESULT_OK;
+ }
+
+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 559a9f8..0ce94ed 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
+@@ -887,6 +887,9 @@ static bool dce110_link_encoder_validate_hdmi_output(
+ crtc_timing->pixel_encoding == PIXEL_ENCODING_YCBCR420)
+ return false;
+
++ if (!enc110->base.features.flags.bits.HDMI_6GB_EN &&
++ adjusted_pix_clk_khz >= 300000)
++ return false;
+ return true;
+ }
+
+@@ -1008,6 +1011,7 @@ bool dce110_link_encoder_construct(
+ bp_cap_info.DP_HBR2_EN;
+ enc110->base.features.flags.bits.IS_HBR3_CAPABLE =
+ bp_cap_info.DP_HBR3_EN;
++ enc110->base.features.flags.bits.HDMI_6GB_EN = bp_cap_info.HDMI_6GB_EN;
+ }
+
+ return true;
+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 38e4070..961bbcc 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
+@@ -37,6 +37,7 @@ struct encoder_feature_support {
+ uint32_t IS_TPS3_CAPABLE:1;
+ uint32_t IS_TPS4_CAPABLE:1;
+ uint32_t IS_YCBCR_CAPABLE:1;
++ uint32_t HDMI_6GB_EN:1;
+ } bits;
+ uint32_t raw;
+ } flags;
+--
+2.7.4
+