From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Sat, 27 Jan 2024 01:25:17 +0000 (-0800)
Subject: 6.1-stable patches
X-Git-Tag: v6.1.76~73
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=04391c6c7ebd9dd51c15880d59d25db9b55c8de3;p=thirdparty%2Fkernel%2Fstable-queue.git

6.1-stable patches

added patches:
	drm-amd-display-pbn_div-need-be-updated-for-hotplug-event.patch
---

diff --git a/queue-6.1/drm-amd-display-pbn_div-need-be-updated-for-hotplug-event.patch b/queue-6.1/drm-amd-display-pbn_div-need-be-updated-for-hotplug-event.patch
new file mode 100644
index 00000000000..018b995ddd5
--- /dev/null
+++ b/queue-6.1/drm-amd-display-pbn_div-need-be-updated-for-hotplug-event.patch
@@ -0,0 +1,39 @@
+From 9cdef4f720376ef0fb0febce1ed2377c19e531f9 Mon Sep 17 00:00:00 2001
+From: Wayne Lin <wayne.lin@amd.com>
+Date: Mon, 4 Dec 2023 10:09:33 +0800
+Subject: drm/amd/display: pbn_div need be updated for hotplug event
+
+From: Wayne Lin <wayne.lin@amd.com>
+
+commit 9cdef4f720376ef0fb0febce1ed2377c19e531f9 upstream.
+
+link_rate sometime will be changed when DP MST connector hotplug, so
+pbn_div also need be updated; otherwise, it will mismatch with
+link_rate, causes no output in external monitor.
+
+This is a backport to 6.7 and older.
+
+Cc: stable@vger.kernel.org
+Tested-by: Daniel Wheeler <daniel.wheeler@amd.com>
+Reviewed-by: Jerry Zuo <jerry.zuo@amd.com>
+Acked-by: Rodrigo Siqueira <rodrigo.siqueira@amd.com>
+Signed-off-by: Wade Wang <wade.wang@hp.com>
+Signed-off-by: Wayne Lin <wayne.lin@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 |    3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
++++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
+@@ -6677,8 +6677,7 @@ static int dm_encoder_helper_atomic_chec
+ 	if (IS_ERR(mst_state))
+ 		return PTR_ERR(mst_state);
+ 
+-	if (!mst_state->pbn_div)
+-		mst_state->pbn_div = dm_mst_get_pbn_divider(aconnector->mst_port->dc_link);
++	mst_state->pbn_div = dm_mst_get_pbn_divider(aconnector->mst_port->dc_link);
+ 
+ 	if (!state->duplicated) {
+ 		int max_bpc = conn_state->max_requested_bpc;
diff --git a/queue-6.1/series b/queue-6.1/series
index f4abaa31f98..83663ea3bcc 100644
--- a/queue-6.1/series
+++ b/queue-6.1/series
@@ -76,3 +76,4 @@ ksmbd-add-missing-set_freezable-for-freezable-kthread.patch
 rdma-irdma-ensure-iwarp-qp-queue-memory-is-os-paged-aligned.patch
 rdma-irdma-fix-support-for-64k-pages.patch
 revert-drm-amd-enable-pcie-pme-from-d3.patch
+drm-amd-display-pbn_div-need-be-updated-for-hotplug-event.patch