From: Greg Kroah-Hartman Date: Tue, 1 Apr 2025 10:50:37 +0000 (+0100) Subject: 6.12-stable patches X-Git-Tag: v6.1.133~35 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=67f83f50174a230a277f176a3ef3af7fd1ab3743;p=thirdparty%2Fkernel%2Fstable-queue.git 6.12-stable patches added patches: drm-amd-display-don-t-write-dp_mstm_ctrl-after-lt.patch nfsd-fix-legacy-client-tracking-initialization.patch --- diff --git a/queue-6.12/drm-amd-display-don-t-write-dp_mstm_ctrl-after-lt.patch b/queue-6.12/drm-amd-display-don-t-write-dp_mstm_ctrl-after-lt.patch new file mode 100644 index 0000000000..d0e0d65e28 --- /dev/null +++ b/queue-6.12/drm-amd-display-don-t-write-dp_mstm_ctrl-after-lt.patch @@ -0,0 +1,70 @@ +From bc068194f548ef1f230d96c4398046bf59165992 Mon Sep 17 00:00:00 2001 +From: Wayne Lin +Date: Fri, 25 Oct 2024 12:27:26 +0800 +Subject: drm/amd/display: Don't write DP_MSTM_CTRL after LT + +From: Wayne Lin + +commit bc068194f548ef1f230d96c4398046bf59165992 upstream. + +[Why] +Observe after suspend/resme, we can't light up mst monitors under specific +mst hub. The reason is that driver still writes DPCD DP_MSTM_CTRL after LT. +It's forbidden even we write the same value for that dpcd register. + +[How] +We already resume the mst branch device dpcd settings during +resume_mst_branch_status(). Leverage drm_dp_mst_topology_queue_probe() to +only probe the topology, not calling drm_dp_mst_topology_mgr_resume() which +will set DP_MSTM_CTRL as well. + +Reviewed-by: Jerry Zuo +Signed-off-by: Wayne Lin +Signed-off-by: Zaeem Mohamed +Tested-by: Daniel Wheeler +Signed-off-by: Alex Deucher +Signed-off-by: Thadeu Lima de Souza Cascardo +Signed-off-by: Greg Kroah-Hartman +--- + drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 16 ++++------------ + 1 file changed, 4 insertions(+), 12 deletions(-) + +--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c ++++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +@@ -3231,8 +3231,7 @@ static int dm_resume(void *handle) + struct dm_atomic_state *dm_state = to_dm_atomic_state(dm->atomic_obj.state); + enum dc_connection_type new_connection_type = dc_connection_none; + struct dc_state *dc_state; +- int i, r, j, ret; +- bool need_hotplug = false; ++ int i, r, j; + struct dc_commit_streams_params commit_params = {}; + + if (dm->dc->caps.ips_support) { +@@ -3427,23 +3426,16 @@ static int dm_resume(void *handle) + aconnector->mst_root) + continue; + +- ret = drm_dp_mst_topology_mgr_resume(&aconnector->mst_mgr, true); +- +- if (ret < 0) { +- dm_helpers_dp_mst_stop_top_mgr(aconnector->dc_link->ctx, +- aconnector->dc_link); +- need_hotplug = true; +- } ++ drm_dp_mst_topology_queue_probe(&aconnector->mst_mgr); + } + drm_connector_list_iter_end(&iter); + +- if (need_hotplug) +- drm_kms_helper_hotplug_event(ddev); +- + amdgpu_dm_irq_resume_late(adev); + + amdgpu_dm_smu_write_watermarks_table(adev); + ++ drm_kms_helper_hotplug_event(ddev); ++ + return 0; + } + diff --git a/queue-6.12/nfsd-fix-legacy-client-tracking-initialization.patch b/queue-6.12/nfsd-fix-legacy-client-tracking-initialization.patch new file mode 100644 index 0000000000..9e831d4bd6 --- /dev/null +++ b/queue-6.12/nfsd-fix-legacy-client-tracking-initialization.patch @@ -0,0 +1,37 @@ +From de71d4e211eddb670b285a0ea477a299601ce1ca Mon Sep 17 00:00:00 2001 +From: Scott Mayhew +Date: Tue, 10 Dec 2024 07:25:54 -0500 +Subject: nfsd: fix legacy client tracking initialization + +From: Scott Mayhew + +commit de71d4e211eddb670b285a0ea477a299601ce1ca upstream. + +Get rid of the nfsd4_legacy_tracking_ops->init() call in +check_for_legacy_methods(). That will be handled in the caller +(nfsd4_client_tracking_init()). Otherwise, we'll wind up calling +nfsd4_legacy_tracking_ops->init() twice, and the second time we'll +trigger the BUG_ON() in nfsd4_init_recdir(). + +Fixes: 74fd48739d04 ("nfsd: new Kconfig option for legacy client tracking") +Reported-by: Jur van der Burg +Link: https://bugzilla.kernel.org/show_bug.cgi?id=219580 +Signed-off-by: Scott Mayhew +Reviewed-by: Jeff Layton +Tested-by: Salvatore Bonaccorso +Signed-off-by: Chuck Lever +Signed-off-by: Greg Kroah-Hartman +--- + fs/nfsd/nfs4recover.c | 1 - + 1 file changed, 1 deletion(-) + +--- a/fs/nfsd/nfs4recover.c ++++ b/fs/nfsd/nfs4recover.c +@@ -2052,7 +2052,6 @@ static inline int check_for_legacy_metho + path_put(&path); + if (status) + return -ENOTDIR; +- status = nn->client_tracking_ops->init(net); + } + return status; + } diff --git a/queue-6.12/series b/queue-6.12/series index e51dfb991c..0f921e77da 100644 --- a/queue-6.12/series +++ b/queue-6.12/series @@ -1,3 +1,5 @@ alsa-usb-audio-add-quirk-for-plantronics-headsets-to-fix-control-names.patch hid-hid-plantronics-add-mic-mute-mapping-and-generalize-quirks.patch atm-fix-null-pointer-dereference.patch +nfsd-fix-legacy-client-tracking-initialization.patch +drm-amd-display-don-t-write-dp_mstm_ctrl-after-lt.patch