This is a note to let you know that I've just added the patch titled
drm/display/dp_mst: Fix drm_dp_mst_add_affected_dsc_crtcs() return code
to the 6.0-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-drm_dp_mst_add_affected_dsc_crtcs-return-code.patch
and it can be found in the queue-6.0 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
>From 2f3a1273862cb82cca227630cc7f04ce0c94b6bb Mon Sep 17 00:00:00 2001
From: Lyude Paul <lyude@xxxxxxxxxx>
Date: Mon, 14 Nov 2022 17:17:53 -0500
Subject: drm/display/dp_mst: Fix drm_dp_mst_add_affected_dsc_crtcs() return code
From: Lyude Paul <lyude@xxxxxxxxxx>
commit 2f3a1273862cb82cca227630cc7f04ce0c94b6bb upstream.
Looks like that we're accidentally dropping a pretty important return code
here. For some reason, we just return -EINVAL if we fail to get the MST
topology state. This is wrong: error codes are important and should never
be squashed without being handled, which here seems to have the potential
to cause a deadlock.
Signed-off-by: Lyude Paul <lyude@xxxxxxxxxx>
Reviewed-by: Wayne Lin <Wayne.Lin@xxxxxxx>
Fixes: 8ec046716ca8 ("drm/dp_mst: Add helper to trigger modeset on affected DSC MST CRTCs")
Cc: <stable@xxxxxxxxxxxxxxx> # v5.6+
Signed-off-by: Alex Deucher <alexander.deucher@xxxxxxx>
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
@@ -5293,7 +5293,7 @@ int drm_dp_mst_add_affected_dsc_crtcs(st
mst_state = drm_atomic_get_mst_topology_state(state, mgr);
if (IS_ERR(mst_state))
- return -EINVAL;
+ return PTR_ERR(mst_state);
list_for_each_entry(pos, &mst_state->vcpis, next) {
Patches currently in stable-queue which might be from lyude@xxxxxxxxxx are
queue-6.0/drm-amd-dc-dce120-fix-audio-register-mapping-stop-triggering-kasan.patch
queue-6.0/drm-display-dp_mst-fix-drm_dp_mst_add_affected_dsc_crtcs-return-code.patch
