From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Fri, 6 Aug 2021 06:59:24 +0000 (+0200)
Subject: 5.13-stable patches
X-Git-Tag: v4.4.279~9
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=05b3681e8442e16b0e207551c6ee70d2f446b28f;p=thirdparty%2Fkernel%2Fstable-queue.git

5.13-stable patches

added patches:
	drm-amd-display-fix-assr-regression-on-embedded-panels.patch
---

diff --git a/queue-5.13/drm-amd-display-fix-assr-regression-on-embedded-panels.patch b/queue-5.13/drm-amd-display-fix-assr-regression-on-embedded-panels.patch
new file mode 100644
index 00000000000..81c6bbc4f7e
--- /dev/null
+++ b/queue-5.13/drm-amd-display-fix-assr-regression-on-embedded-panels.patch
@@ -0,0 +1,42 @@
+From 6be50f5d83adc9541de3d5be26e968182b5ac150 Mon Sep 17 00:00:00 2001
+From: Stylon Wang <stylon.wang@amd.com>
+Date: Wed, 21 Jul 2021 12:25:24 +0800
+Subject: drm/amd/display: Fix ASSR regression on embedded panels
+
+From: Stylon Wang <stylon.wang@amd.com>
+
+commit 6be50f5d83adc9541de3d5be26e968182b5ac150 upstream.
+
+[Why]
+Regression found in some embedded panels traces back to the earliest
+upstreamed ASSR patch. The changed code flow are causing problems
+with some panels.
+
+[How]
+- Change ASSR enabling code while preserving original code flow
+  as much as possible
+- Simplify the code on guarding with internal display flag
+
+Bug: https://bugzilla.kernel.org/show_bug.cgi?id=213779
+Bug: https://gitlab.freedesktop.org/drm/amd/-/issues/1620
+Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
+Signed-off-by: Stylon Wang <stylon.wang@amd.com>
+Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
+Cc: stable@vger.kernel.org
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c |    3 ---
+ 1 file changed, 3 deletions(-)
+
+--- a/drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c
++++ b/drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c
+@@ -1675,9 +1675,6 @@ static enum dp_panel_mode try_enable_ass
+ 	} else
+ 		panel_mode = DP_PANEL_MODE_DEFAULT;
+ 
+-#else
+-	/* turn off ASSR if the implementation is not compiled in */
+-	panel_mode = DP_PANEL_MODE_DEFAULT;
+ #endif
+ 	return panel_mode;
+ }
diff --git a/queue-5.13/series b/queue-5.13/series
index a027cfa7fd4..df12da78931 100644
--- a/queue-5.13/series
+++ b/queue-5.13/series
@@ -32,3 +32,4 @@ io_uring-explicitly-catch-any-illegal-async-queue-at.patch
 revert-spi-mediatek-fix-fifo-rx-mode.patch
 revert-bluetooth-shutdown-controller-after-workqueues-are-flushed-or-cancelled.patch
 revert-watchdog-itco_wdt-account-for-rebooting-on-second-timeout.patch
+drm-amd-display-fix-assr-regression-on-embedded-panels.patch