From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Sun, 17 Sep 2023 07:11:16 +0000 (+0200)
Subject: 6.5-stable patches
X-Git-Tag: v5.10.195~15
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=2440392ac646b57417dcd508f5976d13303a6e41;p=thirdparty%2Fkernel%2Fstable-queue.git

6.5-stable patches

added patches:
	drm-amd-display-fix-a-bug-when-searching-for-insert_above_mpcc.patch
---

diff --git a/queue-6.5/drm-amd-display-fix-a-bug-when-searching-for-insert_above_mpcc.patch b/queue-6.5/drm-amd-display-fix-a-bug-when-searching-for-insert_above_mpcc.patch
new file mode 100644
index 00000000000..ec7e0bfaca3
--- /dev/null
+++ b/queue-6.5/drm-amd-display-fix-a-bug-when-searching-for-insert_above_mpcc.patch
@@ -0,0 +1,43 @@
+From 3d028d5d60d516c536de1ddd3ebf3d55f3f8983b Mon Sep 17 00:00:00 2001
+From: Wesley Chalmers <wesley.chalmers@amd.com>
+Date: Wed, 21 Jun 2023 19:13:26 -0400
+Subject: drm/amd/display: Fix a bug when searching for insert_above_mpcc
+
+From: Wesley Chalmers <wesley.chalmers@amd.com>
+
+commit 3d028d5d60d516c536de1ddd3ebf3d55f3f8983b upstream.
+
+[WHY]
+Currently, when insert_plane is called with insert_above_mpcc
+parameter that is equal to tree->opp_list, the function returns NULL.
+
+[HOW]
+Instead, the function should insert the plane at the top of the tree.
+
+Cc: Mario Limonciello <mario.limonciello@amd.com>
+Cc: Alex Deucher <alexander.deucher@amd.com>
+Cc: stable@vger.kernel.org
+Reviewed-by: Jun Lei <jun.lei@amd.com>
+Acked-by: Tom Chung <chiahsuan.chung@amd.com>
+Signed-off-by: Wesley Chalmers <wesley.chalmers@amd.com>
+Tested-by: Daniel Wheeler <daniel.wheeler@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/dc/dcn10/dcn10_mpc.c |    5 +++--
+ 1 file changed, 3 insertions(+), 2 deletions(-)
+
+--- a/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_mpc.c
++++ b/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_mpc.c
+@@ -212,8 +212,9 @@ struct mpcc *mpc1_insert_plane(
+ 		/* check insert_above_mpcc exist in tree->opp_list */
+ 		struct mpcc *temp_mpcc = tree->opp_list;
+ 
+-		while (temp_mpcc && temp_mpcc->mpcc_bot != insert_above_mpcc)
+-			temp_mpcc = temp_mpcc->mpcc_bot;
++		if (temp_mpcc != insert_above_mpcc)
++			while (temp_mpcc && temp_mpcc->mpcc_bot != insert_above_mpcc)
++				temp_mpcc = temp_mpcc->mpcc_bot;
+ 		if (temp_mpcc == NULL)
+ 			return NULL;
+ 	}
diff --git a/queue-6.5/series b/queue-6.5/series
index cb0594d8d37..0c6d70b5271 100644
--- a/queue-6.5/series
+++ b/queue-6.5/series
@@ -282,3 +282,4 @@ igb-clean-up-in-all-error-paths-when-enabling-sr-iov.patch
 net-renesas-rswitch-fix-unmasking-irq-condition.patch
 kcm-fix-error-handling-for-sock_dgram-in-kcm_sendmsg.patch
 vm-fix-move_vma-memory-accounting-being-off.patch
+drm-amd-display-fix-a-bug-when-searching-for-insert_above_mpcc.patch