fixes for 5.4

Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/queue-5.4/drm-amd-display-reorder-detect_edp_sink_caps-before-.patch b/queue-5.4/drm-amd-display-reorder-detect_edp_sink_caps-before-.patch
new file mode 100644 (file)
index 0000000..b9bfd7b
--- /dev/null
+++ b/queue-5.4/drm-amd-display-reorder-detect_edp_sink_caps-before-.patch
@@ -0,0 +1,41 @@
+From 6051f8be159c9dd2b56e3c176ff990b2f5f6c1cf Mon Sep 17 00:00:00 2001
+From: Sasha Levin <sashal@kernel.org>
+Date: Thu, 9 Jan 2020 16:20:27 +0100
+Subject: drm/amd/display: Reorder detect_edp_sink_caps before link settings
+ read.
+
+From: Mario Kleiner <mario.kleiner.de@gmail.com>
+
+[ Upstream commit 3b7c59754cc22760760a84ebddb8e0b1e8dd871b ]
+
+read_current_link_settings_on_detect() on eDP 1.4+ may use the
+edp_supported_link_rates table which is set up by
+detect_edp_sink_caps(), so that function needs to be called first.
+
+Reviewed-by: Harry Wentland <harry.wentland@amd.com>
+Signed-off-by: Mario Kleiner <mario.kleiner.de@gmail.com>
+Cc: Martin Leung <martin.leung@amd.com>
+Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
+Cc: stable@vger.kernel.org
+Signed-off-by: Sasha Levin <sashal@kernel.org>
+---
+ drivers/gpu/drm/amd/display/dc/core/dc_link.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+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 793aa8e8ec9a..c0f1c62c59b4 100644
+--- a/drivers/gpu/drm/amd/display/dc/core/dc_link.c
++++ b/drivers/gpu/drm/amd/display/dc/core/dc_link.c
+@@ -809,8 +809,8 @@ bool dc_link_detect(struct dc_link *link, enum dc_detect_reason reason)
+               }
+ 
+               case SIGNAL_TYPE_EDP: {
+-                      read_edp_current_link_settings_on_detect(link);
+                       detect_edp_sink_caps(link);
++                      read_edp_current_link_settings_on_detect(link);
+                       sink_caps.transaction_type =
+                               DDC_TRANSACTION_TYPE_I2C_OVER_AUX;
+                       sink_caps.signal = SIGNAL_TYPE_EDP;
+-- 
+2.20.1
+

diff --git a/queue-5.4/series b/queue-5.4/series
index 65366b23e29f6b4de34f9f6be786d66c87a5c4db..182ce90da10da9601bce6d4a043e15ae04246791 100644 (file)
--- a/queue-5.4/series
+++ b/queue-5.4/series
@@ -102,3 +102,4 @@ tipc-fix-potential-hanging-after-b-rcast-changing.patch
 tipc-fix-retrans-failure-due-to-wrong-destination.patch
 net-fix-kernel-doc-warning-in-linux-netdevice.h.patch
 block-fix-the-type-of-sts-in-bsg_queue_rq.patch
+drm-amd-display-reorder-detect_edp_sink_caps-before-.patch