1 files changed, 35 insertions, 0 deletions
diff --git a/common/recipes-kernel/linux/linux-yocto-4.14.71/4731-drm-amd-display-Drop-to-fail-safe-mode-if-edid-is-ba.patch b/common/recipes-kernel/linux/linux-yocto-4.14.71/4731-drm-amd-display-Drop-to-fail-safe-mode-if-edid-is-ba.patch
new file mode 100644
index 00000000..909d3356
--- /dev/null
+++ b/common/recipes-kernel/linux/linux-yocto-4.14.71/4731-drm-amd-display-Drop-to-fail-safe-mode-if-edid-is-ba.patch
@@ -0,0 +1,35 @@
+From 022bc228b3719d912336445cce84c28385806f45 Mon Sep 17 00:00:00 2001
+From: Mikita Lipski <mikita.lipski@amd.com>
+Date: Tue, 22 May 2018 15:55:43 -0400
+Subject: [PATCH 4731/5725] drm/amd/display: Drop to fail-safe mode if edid is
+ bad
+
+Provide the connector with a single fail-safe mode of 640x480 for CTS
+tests instead of providing a list of possible base modes.
+
+Signed-off-by: Mikita Lipski <mikita.lipski@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/amdgpu_dm/amdgpu_dm.c | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
+index 2aa0041..8bc6736 100644
+--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
++++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
+@@ -3798,6 +3798,10 @@ static int amdgpu_dm_connector_get_modes(struct drm_connector *connector)
+ 	struct edid *edid = amdgpu_dm_connector->edid;
+ 
+ 	encoder = helper->best_encoder(connector);
++
++	if (!edid || !drm_edid_is_valid(edid))
++		return drm_add_modes_noedid(connector, 640, 480);
++
+ 	amdgpu_dm_connector_ddc_get_modes(connector, edid);
+ 	amdgpu_dm_connector_add_common_modes(encoder, connector);
+ 
+-- 
+2.7.4
+