This is a note to let you know that I've just added the patch titled
drm/display/dp_mst: Fix down message handling after a packet reception error
to the 6.1-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
drm-display-dp_mst-fix-down-message-handling-after-a-packet-reception-error.patch
and it can be found in the queue-6.1 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
>From 1241aedb6b5c7a5a8ad73e5eb3a41cfe18a3e00e Mon Sep 17 00:00:00 2001
From: Imre Deak <imre.deak@xxxxxxxxx>
Date: Wed, 14 Dec 2022 20:42:57 +0200
Subject: drm/display/dp_mst: Fix down message handling after a packet reception error
From: Imre Deak <imre.deak@xxxxxxxxx>
commit 1241aedb6b5c7a5a8ad73e5eb3a41cfe18a3e00e upstream.
After an error during receiving a packet for a multi-packet DP MST
sideband message, the state tracking which packets have been received
already is not reset. This prevents the reception of subsequent down
messages (due to the pending message not yet completed with an
end-of-message-transfer packet).
Fix the above by resetting the reception state after a packet error.
Cc: Lyude Paul <lyude@xxxxxxxxxx>
Cc: <stable@xxxxxxxxxxxxxxx> # v3.17+
Signed-off-by: Imre Deak <imre.deak@xxxxxxxxx>
Reviewed-by: Lyude Paul <lyude@xxxxxxxxxx>
Link: https://patchwork.freedesktop.org/patch/msgid/20221214184258.2869417-2-imre.deak@xxxxxxxxx
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
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
@@ -3859,7 +3859,7 @@ static int drm_dp_mst_handle_down_rep(st
struct drm_dp_sideband_msg_rx *msg = &mgr->down_rep_recv;
if (!drm_dp_get_one_sb_msg(mgr, false, &mstb))
- goto out;
+ goto out_clear_reply;
/* Multi-packet message transmission, don't clear the reply */
if (!msg->have_eomt)
Patches currently in stable-queue which might be from imre.deak@xxxxxxxxx are
queue-6.1/drm-i915-dp_mst-add-the-mst-topology-state-for-modesetted-crtcs.patch
queue-6.1/drm-display-dp_mst-fix-down-message-handling-after-a-packet-reception-error.patch
queue-6.1/drm-display-dp_mst-fix-down-up-message-handling-after-sink-disconnect.patch
queue-6.1/drm-i915-fix-system-suspend-without-fbdev-being-initialized.patch
queue-6.1/drm-display-dp_mst-fix-payload-addition-on-a-disconnected-sink.patch
queue-6.1/drm-display-dp_mst-add-drm_atomic_get_old_mst_topology_state.patch
