From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Tue, 18 Jan 2022 06:01:28 +0000 (+0100)
Subject: 5.15-stable patches
X-Git-Tag: v5.16.2~27
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=4fae5c46135865e03071505df8d4110b113d1fb9;p=thirdparty%2Fkernel%2Fstable-queue.git

5.15-stable patches

added patches:
	drm-amd-display-explicitly-set-is_dsc_supported-to-false-before-use.patch
---

diff --git a/queue-5.15/drm-amd-display-explicitly-set-is_dsc_supported-to-false-before-use.patch b/queue-5.15/drm-amd-display-explicitly-set-is_dsc_supported-to-false-before-use.patch
new file mode 100644
index 00000000000..527d74efd3e
--- /dev/null
+++ b/queue-5.15/drm-amd-display-explicitly-set-is_dsc_supported-to-false-before-use.patch
@@ -0,0 +1,32 @@
+From 63ad5371cd1e379519395c49a4b6a652c36c98e5 Mon Sep 17 00:00:00 2001
+From: Mario Limonciello <mario.limonciello@amd.com>
+Date: Wed, 5 Jan 2022 12:48:16 -0600
+Subject: drm/amd/display: explicitly set is_dsc_supported to false before use
+
+From: Mario Limonciello <mario.limonciello@amd.com>
+
+commit 63ad5371cd1e379519395c49a4b6a652c36c98e5 upstream.
+
+When UBSAN is enabled a case is shown on unplugging the display that
+this variable hasn't been initialized by `update_dsc_caps`, presumably
+when the display was unplugged it wasn't copied from the DPCD.
+
+Link: https://bugs.launchpad.net/ubuntu/+source/linux/+bug/1956497
+Signed-off-by: Mario Limonciello <mario.limonciello@amd.com>
+Acked-by: Alex Deucher <alexander.deucher@amd.com>
+Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c |    1 +
+ 1 file changed, 1 insertion(+)
+
+--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
++++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
+@@ -5604,6 +5604,7 @@ static void update_dsc_caps(struct amdgp
+ 							struct dsc_dec_dpcd_caps *dsc_caps)
+ {
+ 	stream->timing.flags.DSC = 0;
++	dsc_caps->is_dsc_supported = false;
+ 
+ 	if (aconnector->dc_link && sink->sink_signal == SIGNAL_TYPE_DISPLAY_PORT) {
+ 		dc_dsc_parse_dsc_dpcd(aconnector->dc_link->ctx->dc,
diff --git a/queue-5.15/series b/queue-5.15/series
index 12787d2c4b5..440987ade44 100644
--- a/queue-5.15/series
+++ b/queue-5.15/series
@@ -1 +1,2 @@
 devtmpfs-regression-fix-reconfigure-on-each-mount.patch
+drm-amd-display-explicitly-set-is_dsc_supported-to-false-before-use.patch