From: Greg Kroah-Hartman Date: Wed, 14 Aug 2024 11:37:56 +0000 (+0200) Subject: drop drm-amd-display-defer-handling-mst-up-request-in-resume.patch X-Git-Tag: v6.1.105~1 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=754e9864c2601e1e44edfb5085c01749a0517a50;p=thirdparty%2Fkernel%2Fstable-queue.git drop drm-amd-display-defer-handling-mst-up-request-in-resume.patch Will come back later --- diff --git a/queue-6.1/drm-amd-display-defer-handling-mst-up-request-in-resume.patch b/queue-6.1/drm-amd-display-defer-handling-mst-up-request-in-resume.patch deleted file mode 100644 index c2a069c9d74..00000000000 --- a/queue-6.1/drm-amd-display-defer-handling-mst-up-request-in-resume.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 202dc359addab29451d3d18243c3d957da5392c8 Mon Sep 17 00:00:00 2001 -From: Wayne Lin -Date: Mon, 15 Apr 2024 14:04:00 +0800 -Subject: drm/amd/display: Defer handling mst up request in resume - -From: Wayne Lin - -commit 202dc359addab29451d3d18243c3d957da5392c8 upstream. - -[Why] -Like commit ec5fa9fcdeca ("drm/amd/display: Adjust the MST resume flow"), we -want to avoid handling mst topology changes before restoring the old state. -If we enable DP_UP_REQ_EN before calling drm_atomic_helper_resume(), have -changce to handle CSN event first and fire hotplug event before restoring the -cached state. - -[How] -Disable mst branch sending up request event before we restoring the cached state. -DP_UP_REQ_EN will be set later when we call drm_dp_mst_topology_mgr_resume(). - -Cc: Mario Limonciello -Cc: Alex Deucher -Cc: stable@vger.kernel.org -Reviewed-by: Hersen Wu -Signed-off-by: Wayne Lin -Tested-by: Daniel Wheeler -Signed-off-by: Alex Deucher -Signed-off-by: Greg Kroah-Hartman ---- - drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 1 - - 1 file changed, 1 deletion(-) - ---- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c -+++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c -@@ -2363,7 +2363,6 @@ static void resume_mst_branch_status(str - - ret = drm_dp_dpcd_writeb(mgr->aux, DP_MSTM_CTRL, - DP_MST_EN | -- DP_UP_REQ_EN | - DP_UPSTREAM_IS_SRC); - if (ret < 0) { - drm_dbg_kms(mgr->dev, "mst write failed - undocked during suspend?\n"); diff --git a/queue-6.1/series b/queue-6.1/series index 55e2dacd9d1..0ec0b0e70ef 100644 --- a/queue-6.1/series +++ b/queue-6.1/series @@ -141,7 +141,6 @@ mm-hugetlb-fix-potential-race-in-__update_and_free_hugetlb_folio.patch block-call-.limit_depth-after-.hctx-has-been-set.patch block-mq-deadline-fix-the-tag-reservation-code.patch xfs-fix-log-recovery-buffer-allocation-for-the-legacy-h_size-fixup.patch -drm-amd-display-defer-handling-mst-up-request-in-resume.patch netfilter-nf_tables-bail-out-if-stateful-expression-provides-no-.clone.patch netfilter-nf_tables-allow-clone-callbacks-to-sleep.patch netfilter-nf_tables-prefer-nft_chain_validate.patch diff --git a/queue-6.10/drm-amd-display-defer-handling-mst-up-request-in-resume.patch b/queue-6.10/drm-amd-display-defer-handling-mst-up-request-in-resume.patch deleted file mode 100644 index a1553b0394a..00000000000 --- a/queue-6.10/drm-amd-display-defer-handling-mst-up-request-in-resume.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 202dc359addab29451d3d18243c3d957da5392c8 Mon Sep 17 00:00:00 2001 -From: Wayne Lin -Date: Mon, 15 Apr 2024 14:04:00 +0800 -Subject: drm/amd/display: Defer handling mst up request in resume - -From: Wayne Lin - -commit 202dc359addab29451d3d18243c3d957da5392c8 upstream. - -[Why] -Like commit ec5fa9fcdeca ("drm/amd/display: Adjust the MST resume flow"), we -want to avoid handling mst topology changes before restoring the old state. -If we enable DP_UP_REQ_EN before calling drm_atomic_helper_resume(), have -changce to handle CSN event first and fire hotplug event before restoring the -cached state. - -[How] -Disable mst branch sending up request event before we restoring the cached state. -DP_UP_REQ_EN will be set later when we call drm_dp_mst_topology_mgr_resume(). - -Cc: Mario Limonciello -Cc: Alex Deucher -Cc: stable@vger.kernel.org -Reviewed-by: Hersen Wu -Signed-off-by: Wayne Lin -Tested-by: Daniel Wheeler -Signed-off-by: Alex Deucher -Signed-off-by: Greg Kroah-Hartman ---- - drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 1 - - 1 file changed, 1 deletion(-) - ---- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c -+++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c -@@ -2418,7 +2418,6 @@ static void resume_mst_branch_status(str - - ret = drm_dp_dpcd_writeb(mgr->aux, DP_MSTM_CTRL, - DP_MST_EN | -- DP_UP_REQ_EN | - DP_UPSTREAM_IS_SRC); - if (ret < 0) { - drm_dbg_kms(mgr->dev, "mst write failed - undocked during suspend?\n"); diff --git a/queue-6.10/series b/queue-6.10/series index f8728d44ad1..6c8d90fc311 100644 --- a/queue-6.10/series +++ b/queue-6.10/series @@ -254,7 +254,6 @@ btrfs-fix-corruption-after-buffer-fault-in-during-direct-io-append-write.patch idpf-fix-memleak-in-vport-interrupt-configuration.patch drm-amd-display-add-null-check-in-resource_log_pipe_topology_update.patch drm-amd-display-change-assr-disable-sequence.patch -drm-amd-display-defer-handling-mst-up-request-in-resume.patch mptcp-pm-reduce-indentation-blocks.patch mptcp-pm-don-t-try-to-create-sf-if-alloc-failed.patch mptcp-pm-do-not-ignore-subflow-if-signal-flag-is-also-set.patch diff --git a/queue-6.6/drm-amd-display-defer-handling-mst-up-request-in-resume.patch b/queue-6.6/drm-amd-display-defer-handling-mst-up-request-in-resume.patch deleted file mode 100644 index 2374f354e19..00000000000 --- a/queue-6.6/drm-amd-display-defer-handling-mst-up-request-in-resume.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 202dc359addab29451d3d18243c3d957da5392c8 Mon Sep 17 00:00:00 2001 -From: Wayne Lin -Date: Mon, 15 Apr 2024 14:04:00 +0800 -Subject: drm/amd/display: Defer handling mst up request in resume - -From: Wayne Lin - -commit 202dc359addab29451d3d18243c3d957da5392c8 upstream. - -[Why] -Like commit ec5fa9fcdeca ("drm/amd/display: Adjust the MST resume flow"), we -want to avoid handling mst topology changes before restoring the old state. -If we enable DP_UP_REQ_EN before calling drm_atomic_helper_resume(), have -changce to handle CSN event first and fire hotplug event before restoring the -cached state. - -[How] -Disable mst branch sending up request event before we restoring the cached state. -DP_UP_REQ_EN will be set later when we call drm_dp_mst_topology_mgr_resume(). - -Cc: Mario Limonciello -Cc: Alex Deucher -Cc: stable@vger.kernel.org -Reviewed-by: Hersen Wu -Signed-off-by: Wayne Lin -Tested-by: Daniel Wheeler -Signed-off-by: Alex Deucher -Signed-off-by: Greg Kroah-Hartman ---- - drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 1 - - 1 file changed, 1 deletion(-) - ---- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c -+++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c -@@ -2350,7 +2350,6 @@ static void resume_mst_branch_status(str - - ret = drm_dp_dpcd_writeb(mgr->aux, DP_MSTM_CTRL, - DP_MST_EN | -- DP_UP_REQ_EN | - DP_UPSTREAM_IS_SRC); - if (ret < 0) { - drm_dbg_kms(mgr->dev, "mst write failed - undocked during suspend?\n"); diff --git a/queue-6.6/series b/queue-6.6/series index 313310985d8..196804a1ee5 100644 --- a/queue-6.6/series +++ b/queue-6.6/series @@ -179,7 +179,6 @@ tools-headers-arm64-sync-arm64-s-cputype.h-with-the-kernel-sources.patch mm-hugetlb-fix-potential-race-in-__update_and_free_hugetlb_folio.patch nouveau-set-placement-to-original-placement-on-uvmm-validate.patch xfs-fix-log-recovery-buffer-allocation-for-the-legacy-h_size-fixup.patch -drm-amd-display-defer-handling-mst-up-request-in-resume.patch mptcp-pm-reduce-indentation-blocks.patch mptcp-pm-don-t-try-to-create-sf-if-alloc-failed.patch mptcp-pm-do-not-ignore-subflow-if-signal-flag-is-also-set.patch