From: Greg Kroah-Hartman Date: Wed, 22 Oct 2025 05:29:11 +0000 (+0200) Subject: drop drm patch X-Git-Tag: v6.6.114~5 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=343001ca35d807503e38fa318e320a471b564c75;p=thirdparty%2Fkernel%2Fstable-queue.git drop drm patch --- diff --git a/queue-6.12/drm-ast-blank-with-vgacr17-sync-enable-always-clear-vgacrb6-sync-off.patch b/queue-6.12/drm-ast-blank-with-vgacr17-sync-enable-always-clear-vgacrb6-sync-off.patch deleted file mode 100644 index 90139f0a04..0000000000 --- a/queue-6.12/drm-ast-blank-with-vgacr17-sync-enable-always-clear-vgacrb6-sync-off.patch +++ /dev/null @@ -1,90 +0,0 @@ -From 6f719373b943a955fee6fc2012aed207b65e2854 Mon Sep 17 00:00:00 2001 -From: Thomas Zimmermann -Date: Tue, 14 Oct 2025 10:46:34 +0200 -Subject: drm/ast: Blank with VGACR17 sync enable, always clear VGACRB6 sync off - -From: Thomas Zimmermann - -commit 6f719373b943a955fee6fc2012aed207b65e2854 upstream. - -Blank the display by disabling sync pulses with VGACR17<7>. Unblank -by reenabling them. This VGA setting should be supported by all Aspeed -hardware. - -Ast currently blanks via sync-off bits in VGACRB6. Not all BMCs handle -VGACRB6 correctly. After disabling sync during a reboot, some BMCs do -not reenable it after the soft reset. The display output remains dark. -When the display is off during boot, some BMCs set the sync-off bits in -VGACRB6, so the display remains dark. Observed with Blackbird AST2500 -BMCs. Clearing the sync-off bits unconditionally fixes these issues. - -Also do not modify VGASR1's SD bit for blanking, as it only disables GPU -access to video memory. - -v2: -- init vgacrb6 correctly (Jocelyn) - -Signed-off-by: Thomas Zimmermann -Fixes: ce3d99c83495 ("drm: Call drm_atomic_helper_shutdown() at shutdown time for misc drivers") -Tested-by: Nick Bowler -Reported-by: Nick Bowler -Closes: https://lore.kernel.org/dri-devel/wpwd7rit6t4mnu6kdqbtsnk5bhftgslio6e2jgkz6kgw6cuvvr@xbfswsczfqsi/ -Cc: Douglas Anderson -Cc: Dave Airlie -Cc: Thomas Zimmermann -Cc: Jocelyn Falempe -Cc: dri-devel@lists.freedesktop.org -Cc: # v6.7+ -Reviewed-by: Jocelyn Falempe -Link: https://lore.kernel.org/r/20251014084743.18242-1-tzimmermann@suse.de -Signed-off-by: Greg Kroah-Hartman ---- - drivers/gpu/drm/ast/ast_mode.c | 18 ++++++++++-------- - drivers/gpu/drm/ast/ast_reg.h | 1 + - 2 files changed, 11 insertions(+), 8 deletions(-) - ---- a/drivers/gpu/drm/ast/ast_mode.c -+++ b/drivers/gpu/drm/ast/ast_mode.c -@@ -1195,22 +1195,24 @@ ast_crtc_helper_atomic_flush(struct drm_ - static void ast_crtc_helper_atomic_enable(struct drm_crtc *crtc, struct drm_atomic_state *state) - { - struct ast_device *ast = to_ast_device(crtc->dev); -+ u8 vgacr17 = 0x00; -+ u8 vgacrb6 = 0xff; - -- ast_set_index_reg_mask(ast, AST_IO_VGACRI, 0xb6, 0xfc, 0x00); -- ast_set_index_reg_mask(ast, AST_IO_VGASRI, 0x01, 0xdf, 0x00); -+ vgacr17 |= AST_IO_VGACR17_SYNC_ENABLE; -+ vgacrb6 &= ~(AST_IO_VGACRB6_VSYNC_OFF | AST_IO_VGACRB6_HSYNC_OFF); -+ -+ ast_set_index_reg_mask(ast, AST_IO_VGACRI, 0x17, 0x7f, vgacr17); -+ ast_set_index_reg_mask(ast, AST_IO_VGACRI, 0xb6, 0xfc, vgacrb6); - } - - static void ast_crtc_helper_atomic_disable(struct drm_crtc *crtc, struct drm_atomic_state *state) - { - struct drm_crtc_state *old_crtc_state = drm_atomic_get_old_crtc_state(state, crtc); - struct ast_device *ast = to_ast_device(crtc->dev); -- u8 vgacrb6; -+ u8 vgacr17 = 0xff; - -- ast_set_index_reg_mask(ast, AST_IO_VGASRI, 0x01, 0xdf, AST_IO_VGASR1_SD); -- -- vgacrb6 = AST_IO_VGACRB6_VSYNC_OFF | -- AST_IO_VGACRB6_HSYNC_OFF; -- ast_set_index_reg_mask(ast, AST_IO_VGACRI, 0xb6, 0xfc, vgacrb6); -+ vgacr17 &= ~AST_IO_VGACR17_SYNC_ENABLE; -+ ast_set_index_reg_mask(ast, AST_IO_VGACRI, 0x17, 0x7f, vgacr17); - - /* - * HW cursors require the underlying primary plane and CRTC to ---- a/drivers/gpu/drm/ast/ast_reg.h -+++ b/drivers/gpu/drm/ast/ast_reg.h -@@ -29,6 +29,7 @@ - #define AST_IO_VGAGRI (0x4E) - - #define AST_IO_VGACRI (0x54) -+#define AST_IO_VGACR17_SYNC_ENABLE BIT(7) /* called "Hardware reset" in docs */ - #define AST_IO_VGACR80_PASSWORD (0xa8) - #define AST_IO_VGACRA1_VGAIO_DISABLED BIT(1) - #define AST_IO_VGACRA1_MMIO_ENABLED BIT(2) diff --git a/queue-6.12/series b/queue-6.12/series index c53c7a993a..621b5803d0 100644 --- a/queue-6.12/series +++ b/queue-6.12/series @@ -17,7 +17,6 @@ can-gs_usb-gs_make_candev-populate-net_device-dev_port.patch can-gs_usb-increase-max-interface-to-u8_max.patch cifs-parse_dfs_referrals-prevent-oob-on-malformed-input.patch drm-sched-fix-potential-double-free-in-drm_sched_job_add_resv_dependencies.patch -drm-ast-blank-with-vgacr17-sync-enable-always-clear-vgacrb6-sync-off.patch drm-amdgpu-use-atomic-functions-with-memory-barriers-for-vm-fault-info.patch drm-amdgpu-fix-gfx12-mes-packet-status-return-check.patch perf-core-fix-address-filter-match-with-backing-files.patch diff --git a/queue-6.17/drm-ast-blank-with-vgacr17-sync-enable-always-clear-vgacrb6-sync-off.patch b/queue-6.17/drm-ast-blank-with-vgacr17-sync-enable-always-clear-vgacrb6-sync-off.patch deleted file mode 100644 index 60f4f3b43e..0000000000 --- a/queue-6.17/drm-ast-blank-with-vgacr17-sync-enable-always-clear-vgacrb6-sync-off.patch +++ /dev/null @@ -1,90 +0,0 @@ -From 6f719373b943a955fee6fc2012aed207b65e2854 Mon Sep 17 00:00:00 2001 -From: Thomas Zimmermann -Date: Tue, 14 Oct 2025 10:46:34 +0200 -Subject: drm/ast: Blank with VGACR17 sync enable, always clear VGACRB6 sync off - -From: Thomas Zimmermann - -commit 6f719373b943a955fee6fc2012aed207b65e2854 upstream. - -Blank the display by disabling sync pulses with VGACR17<7>. Unblank -by reenabling them. This VGA setting should be supported by all Aspeed -hardware. - -Ast currently blanks via sync-off bits in VGACRB6. Not all BMCs handle -VGACRB6 correctly. After disabling sync during a reboot, some BMCs do -not reenable it after the soft reset. The display output remains dark. -When the display is off during boot, some BMCs set the sync-off bits in -VGACRB6, so the display remains dark. Observed with Blackbird AST2500 -BMCs. Clearing the sync-off bits unconditionally fixes these issues. - -Also do not modify VGASR1's SD bit for blanking, as it only disables GPU -access to video memory. - -v2: -- init vgacrb6 correctly (Jocelyn) - -Signed-off-by: Thomas Zimmermann -Fixes: ce3d99c83495 ("drm: Call drm_atomic_helper_shutdown() at shutdown time for misc drivers") -Tested-by: Nick Bowler -Reported-by: Nick Bowler -Closes: https://lore.kernel.org/dri-devel/wpwd7rit6t4mnu6kdqbtsnk5bhftgslio6e2jgkz6kgw6cuvvr@xbfswsczfqsi/ -Cc: Douglas Anderson -Cc: Dave Airlie -Cc: Thomas Zimmermann -Cc: Jocelyn Falempe -Cc: dri-devel@lists.freedesktop.org -Cc: # v6.7+ -Reviewed-by: Jocelyn Falempe -Link: https://lore.kernel.org/r/20251014084743.18242-1-tzimmermann@suse.de -Signed-off-by: Greg Kroah-Hartman ---- - drivers/gpu/drm/ast/ast_mode.c | 18 ++++++++++-------- - drivers/gpu/drm/ast/ast_reg.h | 1 + - 2 files changed, 11 insertions(+), 8 deletions(-) - ---- a/drivers/gpu/drm/ast/ast_mode.c -+++ b/drivers/gpu/drm/ast/ast_mode.c -@@ -836,22 +836,24 @@ ast_crtc_helper_atomic_flush(struct drm_ - static void ast_crtc_helper_atomic_enable(struct drm_crtc *crtc, struct drm_atomic_state *state) - { - struct ast_device *ast = to_ast_device(crtc->dev); -+ u8 vgacr17 = 0x00; -+ u8 vgacrb6 = 0xff; - -- ast_set_index_reg_mask(ast, AST_IO_VGACRI, 0xb6, 0xfc, 0x00); -- ast_set_index_reg_mask(ast, AST_IO_VGASRI, 0x01, 0xdf, 0x00); -+ vgacr17 |= AST_IO_VGACR17_SYNC_ENABLE; -+ vgacrb6 &= ~(AST_IO_VGACRB6_VSYNC_OFF | AST_IO_VGACRB6_HSYNC_OFF); -+ -+ ast_set_index_reg_mask(ast, AST_IO_VGACRI, 0x17, 0x7f, vgacr17); -+ ast_set_index_reg_mask(ast, AST_IO_VGACRI, 0xb6, 0xfc, vgacrb6); - } - - static void ast_crtc_helper_atomic_disable(struct drm_crtc *crtc, struct drm_atomic_state *state) - { - struct drm_crtc_state *old_crtc_state = drm_atomic_get_old_crtc_state(state, crtc); - struct ast_device *ast = to_ast_device(crtc->dev); -- u8 vgacrb6; -+ u8 vgacr17 = 0xff; - -- ast_set_index_reg_mask(ast, AST_IO_VGASRI, 0x01, 0xdf, AST_IO_VGASR1_SD); -- -- vgacrb6 = AST_IO_VGACRB6_VSYNC_OFF | -- AST_IO_VGACRB6_HSYNC_OFF; -- ast_set_index_reg_mask(ast, AST_IO_VGACRI, 0xb6, 0xfc, vgacrb6); -+ vgacr17 &= ~AST_IO_VGACR17_SYNC_ENABLE; -+ ast_set_index_reg_mask(ast, AST_IO_VGACRI, 0x17, 0x7f, vgacr17); - - /* - * HW cursors require the underlying primary plane and CRTC to ---- a/drivers/gpu/drm/ast/ast_reg.h -+++ b/drivers/gpu/drm/ast/ast_reg.h -@@ -29,6 +29,7 @@ - #define AST_IO_VGAGRI (0x4E) - - #define AST_IO_VGACRI (0x54) -+#define AST_IO_VGACR17_SYNC_ENABLE BIT(7) /* called "Hardware reset" in docs */ - #define AST_IO_VGACR80_PASSWORD (0xa8) - #define AST_IO_VGACR99_VGAMEM_RSRV_MASK GENMASK(1, 0) - #define AST_IO_VGACRA1_VGAIO_DISABLED BIT(1) diff --git a/queue-6.17/series b/queue-6.17/series index 8299eb83fd..20df78937a 100644 --- a/queue-6.17/series +++ b/queue-6.17/series @@ -37,7 +37,6 @@ alsa-hda-realtek-add-quirk-entry-for-hp-zbook-17-g6.patch alsa-hda-cs35l41-fix-null-pointer-dereference-in-cs35l41_get_acpi_mute_state.patch alsa-hda-fix-missing-pointer-check-in-hda_component_manager_init-function.patch drm-sched-fix-potential-double-free-in-drm_sched_job_add_resv_dependencies.patch -drm-ast-blank-with-vgacr17-sync-enable-always-clear-vgacrb6-sync-off.patch drm-amdgpu-use-atomic-functions-with-memory-barriers-for-vm-fault-info.patch drm-amdgpu-fix-gfx12-mes-packet-status-return-check.patch drm-xe-increase-global-invalidation-timeout-to-1000us.patch