From fcb8ea9062c7353f75475b50f2078f5ad0cc8a6d Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Fri, 7 Aug 2026 15:26:34 +0200 Subject: [PATCH] drop drm patch --- ...ute-wait-frames-to-dce110_set_avmute.patch | 60 ------------------- queue-6.12/series | 1 - ...ute-wait-frames-to-dce110_set_avmute.patch | 60 ------------------- queue-6.18/series | 1 - ...ute-wait-frames-to-dce110_set_avmute.patch | 60 ------------------- queue-7.1/series | 1 - 6 files changed, 183 deletions(-) delete mode 100644 queue-6.12/drm-amd-display-add-av-mute-wait-frames-to-dce110_set_avmute.patch delete mode 100644 queue-6.18/drm-amd-display-add-av-mute-wait-frames-to-dce110_set_avmute.patch delete mode 100644 queue-7.1/drm-amd-display-add-av-mute-wait-frames-to-dce110_set_avmute.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 index 9f497d460e..0000000000 --- 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 -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 - -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 -Signed-off-by: Ray Wu -Signed-off-by: Fangzhi Zuo -Tested-by: Dan Wheeler -Signed-off-by: Alex Deucher -(cherry picked from commit 414da24137ace80d8c59fefd43ba3ec9f5f854ba) -Cc: stable@vger.kernel.org -Signed-off-by: Greg Kroah-Hartman ---- - 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 9f980e323f..7c7b1af07a 100644 --- 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 index 012a359a4b..0000000000 --- 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 -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 - -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 -Signed-off-by: Ray Wu -Signed-off-by: Fangzhi Zuo -Tested-by: Dan Wheeler -Signed-off-by: Alex Deucher -(cherry picked from commit 414da24137ace80d8c59fefd43ba3ec9f5f854ba) -Cc: stable@vger.kernel.org -Signed-off-by: Greg Kroah-Hartman ---- - 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 6760ecc41c..64f4507416 100644 --- 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 index 61359b3681..0000000000 --- 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 -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 - -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 -Signed-off-by: Ray Wu -Signed-off-by: Fangzhi Zuo -Tested-by: Dan Wheeler -Signed-off-by: Alex Deucher -(cherry picked from commit 414da24137ace80d8c59fefd43ba3ec9f5f854ba) -Cc: stable@vger.kernel.org -Signed-off-by: Greg Kroah-Hartman ---- - 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 ce4692ce8c..6c40b5463e 100644 --- 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 -- 2.47.3