From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Wed, 5 Jul 2023 19:49:03 +0000 (+0100)
Subject: 6.1-stable patches
X-Git-Tag: v6.4.3~28
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=b7a8037a28eeeeb010af95bd8850862aa66ef7e6;p=thirdparty%2Fkernel%2Fstable-queue.git

6.1-stable patches

added patches:
	drm-use-mgr-dev-in-drm_dbg_kms-in-drm_dp_add_payload_part2.patch
	series
---

diff --git a/queue-6.1/drm-use-mgr-dev-in-drm_dbg_kms-in-drm_dp_add_payload_part2.patch b/queue-6.1/drm-use-mgr-dev-in-drm_dbg_kms-in-drm_dp_add_payload_part2.patch
new file mode 100644
index 00000000000..3f54737a5ca
--- /dev/null
+++ b/queue-6.1/drm-use-mgr-dev-in-drm_dbg_kms-in-drm_dp_add_payload_part2.patch
@@ -0,0 +1,43 @@
+From 54d217406afe250d7a768783baaa79a035f21d38 Mon Sep 17 00:00:00 2001
+From: Jeff Layton <jlayton@kernel.org>
+Date: Wed, 19 Apr 2023 07:24:46 -0400
+Subject: drm: use mgr->dev in drm_dbg_kms in drm_dp_add_payload_part2
+
+From: Jeff Layton <jlayton@kernel.org>
+
+commit 54d217406afe250d7a768783baaa79a035f21d38 upstream.
+
+I've been experiencing some intermittent crashes down in the display
+driver code. The symptoms are ususally a line like this in dmesg:
+
+    amdgpu 0000:30:00.0: [drm] Failed to create MST payload for port 000000006d3a3885: -5
+
+...followed by an Oops due to a NULL pointer dereference.
+
+Switch to using mgr->dev instead of state->dev since "state" can be
+NULL in some cases.
+
+Link: https://bugzilla.redhat.com/show_bug.cgi?id=2184855
+Suggested-by: Jani Nikula <jani.nikula@linux.intel.com>
+Signed-off-by: Jeff Layton <jlayton@kernel.org>
+Reviewed-by: Jani Nikula <jani.nikula@intel.com>
+Reviewed-by: Lyude Paul <lyude@redhat.com>
+Signed-off-by: Lyude Paul <lyude@redhat.com>
+Link: https://patchwork.freedesktop.org/patch/msgid/20230419112447.18471-1-jlayton@kernel.org
+Cc: "Limonciello, Mario" <mario.limonciello@amd.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ drivers/gpu/drm/display/drm_dp_mst_topology.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/drivers/gpu/drm/display/drm_dp_mst_topology.c
++++ b/drivers/gpu/drm/display/drm_dp_mst_topology.c
+@@ -3404,7 +3404,7 @@ int drm_dp_add_payload_part2(struct drm_
+ 
+ 	/* Skip failed payloads */
+ 	if (payload->vc_start_slot == -1) {
+-		drm_dbg_kms(state->dev, "Part 1 of payload creation for %s failed, skipping part 2\n",
++		drm_dbg_kms(mgr->dev, "Part 1 of payload creation for %s failed, skipping part 2\n",
+ 			    payload->port->connector->name);
+ 		return -EIO;
+ 	}
diff --git a/queue-6.1/series b/queue-6.1/series
new file mode 100644
index 00000000000..4c780c4c14c
--- /dev/null
+++ b/queue-6.1/series
@@ -0,0 +1 @@
+drm-use-mgr-dev-in-drm_dbg_kms-in-drm_dp_add_payload_part2.patch