Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

drm/ast: Blank with VGACR17 sync enable, always clear VGACRB6 sync off

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 <tzimmermann@suse.de>
Fixes: ce3d99c83495 ("drm: Call drm_atomic_helper_shutdown() at shutdown time for misc drivers")
Tested-by: Nick Bowler <nbowler@draconx.ca>
Reported-by: Nick Bowler <nbowler@draconx.ca>
Closes: https://lore.kernel.org/dri-devel/wpwd7rit6t4mnu6kdqbtsnk5bhftgslio6e2jgkz6kgw6cuvvr@xbfswsczfqsi/
Cc: Douglas Anderson <dianders@chromium.org>
Cc: Dave Airlie <airlied@redhat.com>
Cc: Thomas Zimmermann <tzimmermann@suse.de>
Cc: Jocelyn Falempe <jfalempe@redhat.com>
Cc: dri-devel@lists.freedesktop.org
Cc: <stable@vger.kernel.org> # v6.7+
Reviewed-by: Jocelyn Falempe <jfalempe@redhat.com>
Link: https://lore.kernel.org/r/20251014084743.18242-1-tzimmermann@suse.de

+11 -8
+10 -8
drivers/gpu/drm/ast/ast_mode.c
··· 836 836 static void ast_crtc_helper_atomic_enable(struct drm_crtc *crtc, struct drm_atomic_state *state) 837 837 { 838 838 struct ast_device *ast = to_ast_device(crtc->dev); 839 + u8 vgacr17 = 0x00; 840 + u8 vgacrb6 = 0xff; 839 841 840 - ast_set_index_reg_mask(ast, AST_IO_VGACRI, 0xb6, 0xfc, 0x00); 841 - ast_set_index_reg_mask(ast, AST_IO_VGASRI, 0x01, 0xdf, 0x00); 842 + vgacr17 |= AST_IO_VGACR17_SYNC_ENABLE; 843 + vgacrb6 &= ~(AST_IO_VGACRB6_VSYNC_OFF | AST_IO_VGACRB6_HSYNC_OFF); 844 + 845 + ast_set_index_reg_mask(ast, AST_IO_VGACRI, 0x17, 0x7f, vgacr17); 846 + ast_set_index_reg_mask(ast, AST_IO_VGACRI, 0xb6, 0xfc, vgacrb6); 842 847 } 843 848 844 849 static void ast_crtc_helper_atomic_disable(struct drm_crtc *crtc, struct drm_atomic_state *state) 845 850 { 846 851 struct drm_crtc_state *old_crtc_state = drm_atomic_get_old_crtc_state(state, crtc); 847 852 struct ast_device *ast = to_ast_device(crtc->dev); 848 - u8 vgacrb6; 853 + u8 vgacr17 = 0xff; 849 854 850 - ast_set_index_reg_mask(ast, AST_IO_VGASRI, 0x01, 0xdf, AST_IO_VGASR1_SD); 851 - 852 - vgacrb6 = AST_IO_VGACRB6_VSYNC_OFF | 853 - AST_IO_VGACRB6_HSYNC_OFF; 854 - ast_set_index_reg_mask(ast, AST_IO_VGACRI, 0xb6, 0xfc, vgacrb6); 855 + vgacr17 &= ~AST_IO_VGACR17_SYNC_ENABLE; 856 + ast_set_index_reg_mask(ast, AST_IO_VGACRI, 0x17, 0x7f, vgacr17); 855 857 856 858 /* 857 859 * HW cursors require the underlying primary plane and CRTC to
+1
drivers/gpu/drm/ast/ast_reg.h
··· 29 29 #define AST_IO_VGAGRI (0x4E) 30 30 31 31 #define AST_IO_VGACRI (0x54) 32 + #define AST_IO_VGACR17_SYNC_ENABLE BIT(7) /* called "Hardware reset" in docs */ 32 33 #define AST_IO_VGACR80_PASSWORD (0xa8) 33 34 #define AST_IO_VGACR99_VGAMEM_RSRV_MASK GENMASK(1, 0) 34 35 #define AST_IO_VGACRA1_VGAIO_DISABLED BIT(1)