drop drm patch

diff --git a/queue-6.12/drm-amd-display-add-av-mute-wait-frames-to-dce110_set_avmute.patch b/queue-6.12/drm-amd-display-add-av-mute-wait-frames-to-dce110_set_avmute.patch
deleted file mode 100644 (file)
index 9f497d4..0000000
--- a/queue-6.12/drm-amd-display-add-av-mute-wait-frames-to-dce110_set_avmute.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-From 443290d70b01e9c35830c300e3247c06581b594c Mon Sep 17 00:00:00 2001
-From: Ray Wu <ray.wu@amd.com>
-Date: Mon, 13 Jul 2026 22:23:34 +0800
-Subject: drm/amd/display: Add AV mute wait frames to dce110_set_avmute
-
-From: Ray Wu <ray.wu@amd.com>
-
-commit 443290d70b01e9c35830c300e3247c06581b594c upstream.
-
-Port the three-frame wait logic from dcn30_set_avmute to
-dce110_set_avmute so that older DCN versions (1.0, 2.0) also
-wait for GCP packets to be sent out before proceeding.
-
-This ensures HDMI sinks properly process the mute state,
-preventing garbled display after link re-establishment.
-
-Closes: https://gitlab.freedesktop.org/drm/amd/-/work_items/5167
-Reviewed-by: Wayne Lin <wayne.lin@amd.com>
-Signed-off-by: Ray Wu <ray.wu@amd.com>
-Signed-off-by: Fangzhi Zuo <jerry.zuo@amd.com>
-Tested-by: Dan Wheeler <daniel.wheeler@amd.com>
-Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
-(cherry picked from commit 414da24137ace80d8c59fefd43ba3ec9f5f854ba)
-Cc: stable@vger.kernel.org
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
----
- drivers/gpu/drm/amd/display/dc/hwss/dce110/dce110_hwseq.c |   21 +++++++++++++-
- 1 file changed, 20 insertions(+), 1 deletion(-)
-
---- a/drivers/gpu/drm/amd/display/dc/hwss/dce110/dce110_hwseq.c
-+++ b/drivers/gpu/drm/amd/display/dc/hwss/dce110/dce110_hwseq.c
-@@ -1256,8 +1256,27 @@ void dce110_blank_stream(struct pipe_ctx
- 
- void dce110_set_avmute(struct pipe_ctx *pipe_ctx, bool enable)
- {
--      if (pipe_ctx != NULL && pipe_ctx->stream_res.stream_enc != NULL)
-+      if (pipe_ctx == NULL || pipe_ctx->stream_res.stream_enc == NULL)
-+              return;
-+
-+      if (dc_is_hdmi_signal(pipe_ctx->stream->signal)) {
-               pipe_ctx->stream_res.stream_enc->funcs->set_avmute(pipe_ctx->stream_res.stream_enc, enable);
-+
-+              /* Wait for three frames to make sure AV mute is sent out.
-+               * Some HDMI sinks need additional GCP packets to properly
-+               * process the mute state, especially after link re-establishment
-+               * with HDMI 2.0 scrambling enabled.
-+               */
-+              if (enable && pipe_ctx->stream_res.tg->funcs->is_tg_enabled(pipe_ctx->stream_res.tg)) {
-+                      int i;
-+
-+                      pipe_ctx->stream_res.tg->funcs->wait_for_state(pipe_ctx->stream_res.tg, CRTC_STATE_VACTIVE);
-+                      for (i = 0; i < 3; i++) {
-+                              pipe_ctx->stream_res.tg->funcs->wait_for_state(pipe_ctx->stream_res.tg, CRTC_STATE_VBLANK);
-+                              pipe_ctx->stream_res.tg->funcs->wait_for_state(pipe_ctx->stream_res.tg, CRTC_STATE_VACTIVE);
-+                      }
-+              }
-+      }
- }
- 
- static enum audio_dto_source translate_to_dto_source(enum controller_id crtc_id)

diff --git a/queue-6.12/series b/queue-6.12/series
index 9f980e323f0841c6deade60f9ddd30c23f10c112..7c7b1af07a1accf22513dc2bcf9303e8440e1f4a 100644 (file)
--- a/queue-6.12/series
+++ b/queue-6.12/series
@@ -237,7 +237,6 @@ can-peak_usb-add-bounds-check-for-usb-channel-index.patch
 can-peak_usb-peak_usb_start-fix-double-free-of-transfer-buffer-on-urb-submit-error.patch
 can-peak_usb-validate-ucan-receive-record-lengths.patch
 can-ctucanfd-add-missing-module_device_table.patch
-drm-amd-display-add-av-mute-wait-frames-to-dce110_set_avmute.patch
 can-ctucanfd-use-self-test-mode-for-presume_ack.patch
 can-ctucanfd-unmap-bar0-using-base-address.patch
 can-ctucanfd-handle-bus-error-interrupts.patch

diff --git a/queue-6.18/drm-amd-display-add-av-mute-wait-frames-to-dce110_set_avmute.patch b/queue-6.18/drm-amd-display-add-av-mute-wait-frames-to-dce110_set_avmute.patch
deleted file mode 100644 (file)
index 012a359..0000000
--- a/queue-6.18/drm-amd-display-add-av-mute-wait-frames-to-dce110_set_avmute.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-From 443290d70b01e9c35830c300e3247c06581b594c Mon Sep 17 00:00:00 2001
-From: Ray Wu <ray.wu@amd.com>
-Date: Mon, 13 Jul 2026 22:23:34 +0800
-Subject: drm/amd/display: Add AV mute wait frames to dce110_set_avmute
-
-From: Ray Wu <ray.wu@amd.com>
-
-commit 443290d70b01e9c35830c300e3247c06581b594c upstream.
-
-Port the three-frame wait logic from dcn30_set_avmute to
-dce110_set_avmute so that older DCN versions (1.0, 2.0) also
-wait for GCP packets to be sent out before proceeding.
-
-This ensures HDMI sinks properly process the mute state,
-preventing garbled display after link re-establishment.
-
-Closes: https://gitlab.freedesktop.org/drm/amd/-/work_items/5167
-Reviewed-by: Wayne Lin <wayne.lin@amd.com>
-Signed-off-by: Ray Wu <ray.wu@amd.com>
-Signed-off-by: Fangzhi Zuo <jerry.zuo@amd.com>
-Tested-by: Dan Wheeler <daniel.wheeler@amd.com>
-Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
-(cherry picked from commit 414da24137ace80d8c59fefd43ba3ec9f5f854ba)
-Cc: stable@vger.kernel.org
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
----
- drivers/gpu/drm/amd/display/dc/hwss/dce110/dce110_hwseq.c |   21 +++++++++++++-
- 1 file changed, 20 insertions(+), 1 deletion(-)
-
---- a/drivers/gpu/drm/amd/display/dc/hwss/dce110/dce110_hwseq.c
-+++ b/drivers/gpu/drm/amd/display/dc/hwss/dce110/dce110_hwseq.c
-@@ -1266,8 +1266,27 @@ void dce110_blank_stream(struct pipe_ctx
- 
- void dce110_set_avmute(struct pipe_ctx *pipe_ctx, bool enable)
- {
--      if (pipe_ctx != NULL && pipe_ctx->stream_res.stream_enc != NULL)
-+      if (pipe_ctx == NULL || pipe_ctx->stream_res.stream_enc == NULL)
-+              return;
-+
-+      if (dc_is_hdmi_signal(pipe_ctx->stream->signal)) {
-               pipe_ctx->stream_res.stream_enc->funcs->set_avmute(pipe_ctx->stream_res.stream_enc, enable);
-+
-+              /* Wait for three frames to make sure AV mute is sent out.
-+               * Some HDMI sinks need additional GCP packets to properly
-+               * process the mute state, especially after link re-establishment
-+               * with HDMI 2.0 scrambling enabled.
-+               */
-+              if (enable && pipe_ctx->stream_res.tg->funcs->is_tg_enabled(pipe_ctx->stream_res.tg)) {
-+                      int i;
-+
-+                      pipe_ctx->stream_res.tg->funcs->wait_for_state(pipe_ctx->stream_res.tg, CRTC_STATE_VACTIVE);
-+                      for (i = 0; i < 3; i++) {
-+                              pipe_ctx->stream_res.tg->funcs->wait_for_state(pipe_ctx->stream_res.tg, CRTC_STATE_VBLANK);
-+                              pipe_ctx->stream_res.tg->funcs->wait_for_state(pipe_ctx->stream_res.tg, CRTC_STATE_VACTIVE);
-+                      }
-+              }
-+      }
- }
- 
- enum audio_dto_source translate_to_dto_source(enum controller_id crtc_id)

diff --git a/queue-6.18/series b/queue-6.18/series
index 6760ecc41c6799ebf93e989fbf90f61e3a804ca9..64f450741644b4bc8b86b805bda9db83ce6bd405 100644 (file)
--- a/queue-6.18/series
+++ b/queue-6.18/series
@@ -305,7 +305,6 @@ can-peak_usb-add-bounds-check-for-usb-channel-index.patch
 can-peak_usb-peak_usb_start-fix-double-free-of-transfer-buffer-on-urb-submit-error.patch
 can-peak_usb-validate-ucan-receive-record-lengths.patch
 can-ctucanfd-add-missing-module_device_table.patch
-drm-amd-display-add-av-mute-wait-frames-to-dce110_set_avmute.patch
 can-ctucanfd-use-self-test-mode-for-presume_ack.patch
 can-ctucanfd-unmap-bar0-using-base-address.patch
 can-ctucanfd-handle-bus-error-interrupts.patch

diff --git a/queue-7.1/drm-amd-display-add-av-mute-wait-frames-to-dce110_set_avmute.patch b/queue-7.1/drm-amd-display-add-av-mute-wait-frames-to-dce110_set_avmute.patch
deleted file mode 100644 (file)
index 61359b3..0000000
--- a/queue-7.1/drm-amd-display-add-av-mute-wait-frames-to-dce110_set_avmute.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-From 443290d70b01e9c35830c300e3247c06581b594c Mon Sep 17 00:00:00 2001
-From: Ray Wu <ray.wu@amd.com>
-Date: Mon, 13 Jul 2026 22:23:34 +0800
-Subject: drm/amd/display: Add AV mute wait frames to dce110_set_avmute
-
-From: Ray Wu <ray.wu@amd.com>
-
-commit 443290d70b01e9c35830c300e3247c06581b594c upstream.
-
-Port the three-frame wait logic from dcn30_set_avmute to
-dce110_set_avmute so that older DCN versions (1.0, 2.0) also
-wait for GCP packets to be sent out before proceeding.
-
-This ensures HDMI sinks properly process the mute state,
-preventing garbled display after link re-establishment.
-
-Closes: https://gitlab.freedesktop.org/drm/amd/-/work_items/5167
-Reviewed-by: Wayne Lin <wayne.lin@amd.com>
-Signed-off-by: Ray Wu <ray.wu@amd.com>
-Signed-off-by: Fangzhi Zuo <jerry.zuo@amd.com>
-Tested-by: Dan Wheeler <daniel.wheeler@amd.com>
-Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
-(cherry picked from commit 414da24137ace80d8c59fefd43ba3ec9f5f854ba)
-Cc: stable@vger.kernel.org
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
----
- drivers/gpu/drm/amd/display/dc/hwss/dce110/dce110_hwseq.c |   21 +++++++++++++-
- 1 file changed, 20 insertions(+), 1 deletion(-)
-
---- a/drivers/gpu/drm/amd/display/dc/hwss/dce110/dce110_hwseq.c
-+++ b/drivers/gpu/drm/amd/display/dc/hwss/dce110/dce110_hwseq.c
-@@ -1320,8 +1320,27 @@ void dce110_blank_stream(struct pipe_ctx
- 
- void dce110_set_avmute(struct pipe_ctx *pipe_ctx, bool enable)
- {
--      if (pipe_ctx != NULL && pipe_ctx->stream_res.stream_enc != NULL)
-+      if (pipe_ctx == NULL || pipe_ctx->stream_res.stream_enc == NULL)
-+              return;
-+
-+      if (dc_is_hdmi_signal(pipe_ctx->stream->signal)) {
-               pipe_ctx->stream_res.stream_enc->funcs->set_avmute(pipe_ctx->stream_res.stream_enc, enable);
-+
-+              /* Wait for three frames to make sure AV mute is sent out.
-+               * Some HDMI sinks need additional GCP packets to properly
-+               * process the mute state, especially after link re-establishment
-+               * with HDMI 2.0 scrambling enabled.
-+               */
-+              if (enable && pipe_ctx->stream_res.tg->funcs->is_tg_enabled(pipe_ctx->stream_res.tg)) {
-+                      int i;
-+
-+                      pipe_ctx->stream_res.tg->funcs->wait_for_state(pipe_ctx->stream_res.tg, CRTC_STATE_VACTIVE);
-+                      for (i = 0; i < 3; i++) {
-+                              pipe_ctx->stream_res.tg->funcs->wait_for_state(pipe_ctx->stream_res.tg, CRTC_STATE_VBLANK);
-+                              pipe_ctx->stream_res.tg->funcs->wait_for_state(pipe_ctx->stream_res.tg, CRTC_STATE_VACTIVE);
-+                      }
-+              }
-+      }
- }
- 
- enum audio_dto_source translate_to_dto_source(enum controller_id crtc_id)

diff --git a/queue-7.1/series b/queue-7.1/series
index ce4692ce8c238d08334914c6b7c4fffad0437d95..6c40b5463ef6c0284b369e8cda628c9e6841e001 100644 (file)
--- a/queue-7.1/series
+++ b/queue-7.1/series
@@ -375,7 +375,6 @@ can-peak_usb-add-bounds-check-for-usb-channel-index.patch
 can-peak_usb-peak_usb_start-fix-double-free-of-transfer-buffer-on-urb-submit-error.patch
 can-peak_usb-validate-ucan-receive-record-lengths.patch
 can-ctucanfd-add-missing-module_device_table.patch
-drm-amd-display-add-av-mute-wait-frames-to-dce110_set_avmute.patch
 can-ctucanfd-use-self-test-mode-for-presume_ack.patch
 can-ctucanfd-unmap-bar0-using-base-address.patch
 can-ctucanfd-handle-bus-error-interrupts.patch