Drop drm-amd-display-ensure-link-output-is-disabled-in-ba.patch from older trees

Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/queue-6.12/drm-amd-display-ensure-link-output-is-disabled-in-ba.patch b/queue-6.12/drm-amd-display-ensure-link-output-is-disabled-in-ba.patch
deleted file mode 100644 (file)
index e35a283..0000000
--- a/queue-6.12/drm-amd-display-ensure-link-output-is-disabled-in-ba.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-From a3efb7fb7ef93daa2e902171958ef6c9a7df1616 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Tue, 6 Jan 2026 11:11:19 -0500
-Subject: drm/amd/display: Ensure link output is disabled in backend reset for
- PLL_ON
-
-From: Nicholas Kazlauskas <nicholas.kazlauskas@amd.com>
-
-[ Upstream commit 4589712e0111352973131bad975023b25569287c ]
-
-[Why]
-We're missing the code to actually disable the link output when we have
-to leave the SYMCLK_ON but the TX remains OFF.
-
-[How]
-Port the code from DCN401 that detects SYMCLK_ON_TX_OFF and disable
-the link output when the backend is reset.
-
-Reviewed-by: Ovidiu (Ovi) Bunea <ovidiu.bunea@amd.com>
-Signed-off-by: Nicholas Kazlauskas <nicholas.kazlauskas@amd.com>
-Signed-off-by: Matthew Stewart <matthew.stewart2@amd.com>
-Tested-by: Dan Wheeler <daniel.wheeler@amd.com>
-Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- .../drm/amd/display/dc/hwss/dcn31/dcn31_hwseq.c  | 16 +++++++++++++++-
- 1 file changed, 15 insertions(+), 1 deletion(-)
-
-diff --git a/drivers/gpu/drm/amd/display/dc/hwss/dcn31/dcn31_hwseq.c b/drivers/gpu/drm/amd/display/dc/hwss/dcn31/dcn31_hwseq.c
-index 9aa925a0b3b43..322515aee728e 100644
---- a/drivers/gpu/drm/amd/display/dc/hwss/dcn31/dcn31_hwseq.c
-+++ b/drivers/gpu/drm/amd/display/dc/hwss/dcn31/dcn31_hwseq.c
-@@ -525,8 +525,22 @@ static void dcn31_reset_back_end_for_pipe(
-       if (pipe_ctx->stream_res.tg->funcs->set_odm_bypass)
-               pipe_ctx->stream_res.tg->funcs->set_odm_bypass(
-                               pipe_ctx->stream_res.tg, &pipe_ctx->stream->timing);
-+      /*
-+       * TODO - convert symclk_ref_cnts for otg to a bit map to solve
-+       * the case where the same symclk is shared across multiple otg
-+       * instances
-+       */
-       if (dc_is_hdmi_tmds_signal(pipe_ctx->stream->signal))
--              pipe_ctx->stream->link->phy_state.symclk_ref_cnts.otg = 0;
-+              link->phy_state.symclk_ref_cnts.otg = 0;
-+
-+      if (pipe_ctx->top_pipe == NULL) {
-+              if (link->phy_state.symclk_state == SYMCLK_ON_TX_OFF) {
-+                      const struct link_hwss *link_hwss = get_link_hwss(link, &pipe_ctx->link_res);
-+
-+                      link_hwss->disable_link_output(link, &pipe_ctx->link_res, pipe_ctx->stream->signal);
-+                      link->phy_state.symclk_state = SYMCLK_OFF_TX_OFF;
-+              }
-+      }
- 
-       set_drr_and_clear_adjust_pending(pipe_ctx, pipe_ctx->stream, NULL);
- 
--- 
-2.51.0
-

diff --git a/queue-6.12/series b/queue-6.12/series
index 3def5f2c387e1e5f56c1072fbb6a50eb392057b1..bc0f4fd5123fe4a0eee69383f4db3773542cd421 100644 (file)
--- a/queue-6.12/series
+++ b/queue-6.12/series
@@ -565,7 +565,6 @@ virt-vbox-uapi-mark-inner-unions-in-packed-structs-a.patch
 asoc-soc-acpi-intel-arl-match-change-rt722-amp-endpo.patch
 pci-add-intel-nova-lake-audio-device-id.patch
 drm-amd-display-disable-fec-when-powering-down-encod.patch
-drm-amd-display-ensure-link-output-is-disabled-in-ba.patch
 drm-atmel-hlcdc-fix-memory-leak-from-the-atomic_dest.patch
 drm-atmel-hlcdc-don-t-reject-the-commit-if-the-src-r.patch
 drm-atmel-hlcdc-fix-use-after-free-of-drm_crtc_commi.patch

diff --git a/queue-6.6/drm-amd-display-ensure-link-output-is-disabled-in-ba.patch b/queue-6.6/drm-amd-display-ensure-link-output-is-disabled-in-ba.patch
deleted file mode 100644 (file)
index 4e1cd1b..0000000
--- a/queue-6.6/drm-amd-display-ensure-link-output-is-disabled-in-ba.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-From dbd867ccbedca73e627cb8733d7d5c5e6c70b216 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Tue, 6 Jan 2026 11:11:19 -0500
-Subject: drm/amd/display: Ensure link output is disabled in backend reset for
- PLL_ON
-
-From: Nicholas Kazlauskas <nicholas.kazlauskas@amd.com>
-
-[ Upstream commit 4589712e0111352973131bad975023b25569287c ]
-
-[Why]
-We're missing the code to actually disable the link output when we have
-to leave the SYMCLK_ON but the TX remains OFF.
-
-[How]
-Port the code from DCN401 that detects SYMCLK_ON_TX_OFF and disable
-the link output when the backend is reset.
-
-Reviewed-by: Ovidiu (Ovi) Bunea <ovidiu.bunea@amd.com>
-Signed-off-by: Nicholas Kazlauskas <nicholas.kazlauskas@amd.com>
-Signed-off-by: Matthew Stewart <matthew.stewart2@amd.com>
-Tested-by: Dan Wheeler <daniel.wheeler@amd.com>
-Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- .../gpu/drm/amd/display/dc/dcn31/dcn31_hwseq.c   | 16 +++++++++++++++-
- 1 file changed, 15 insertions(+), 1 deletion(-)
-
-diff --git a/drivers/gpu/drm/amd/display/dc/dcn31/dcn31_hwseq.c b/drivers/gpu/drm/amd/display/dc/dcn31/dcn31_hwseq.c
-index 22da2007601ee..a782ffc5f4cf9 100644
---- a/drivers/gpu/drm/amd/display/dc/dcn31/dcn31_hwseq.c
-+++ b/drivers/gpu/drm/amd/display/dc/dcn31/dcn31_hwseq.c
-@@ -523,8 +523,22 @@ static void dcn31_reset_back_end_for_pipe(
-       if (pipe_ctx->stream_res.tg->funcs->set_odm_bypass)
-               pipe_ctx->stream_res.tg->funcs->set_odm_bypass(
-                               pipe_ctx->stream_res.tg, &pipe_ctx->stream->timing);
-+      /*
-+       * TODO - convert symclk_ref_cnts for otg to a bit map to solve
-+       * the case where the same symclk is shared across multiple otg
-+       * instances
-+       */
-       if (dc_is_hdmi_tmds_signal(pipe_ctx->stream->signal))
--              pipe_ctx->stream->link->phy_state.symclk_ref_cnts.otg = 0;
-+              link->phy_state.symclk_ref_cnts.otg = 0;
-+
-+      if (pipe_ctx->top_pipe == NULL) {
-+              if (link->phy_state.symclk_state == SYMCLK_ON_TX_OFF) {
-+                      const struct link_hwss *link_hwss = get_link_hwss(link, &pipe_ctx->link_res);
-+
-+                      link_hwss->disable_link_output(link, &pipe_ctx->link_res, pipe_ctx->stream->signal);
-+                      link->phy_state.symclk_state = SYMCLK_OFF_TX_OFF;
-+              }
-+      }
- 
-       if (pipe_ctx->stream_res.tg->funcs->set_drr)
-               pipe_ctx->stream_res.tg->funcs->set_drr(
--- 
-2.51.0
-

diff --git a/queue-6.6/series b/queue-6.6/series
index 381023eee610f72475100981e6351f070be3a8e6..88e82b1ca6197157dbc2da4721f72c174ec228d0 100644 (file)
--- a/queue-6.6/series
+++ b/queue-6.6/series
@@ -404,7 +404,6 @@ drm-amdkfd-fix-gart-pte-for-non-4k-pagesize-in-svm_m.patch
 drm-account-property-blob-allocations-to-memcg.patch
 hyper-v-mark-inner-union-in-hv_kvp_exchg_msg_value-a.patch
 virt-vbox-uapi-mark-inner-unions-in-packed-structs-a.patch
-drm-amd-display-ensure-link-output-is-disabled-in-ba.patch
 drm-atmel-hlcdc-fix-memory-leak-from-the-atomic_dest.patch
 drm-atmel-hlcdc-don-t-reject-the-commit-if-the-src-r.patch
 drm-atmel-hlcdc-fix-use-after-free-of-drm_crtc_commi.patch