github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-11-07 06:17:02 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

vt: Remove old-style con_blank

Browse Source 
All consoles implement the new con_blank plus con_unblank. Remove
the old semantics from con_blank. Always pass a VESA blank mode to
the blank parameter.

Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de>
Signed-off-by: Helge Deller <deller@gmx.de>
This commit is contained in:
Thomas Zimmermann 2026-10-23 15:16:17 +02:00 committed by Helge Deller
parent d98fbdba7d
commit e220f288b7
1 changed files with 8 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
drivers/tty/vt/vt.c
View File

@ -4788,10 +4788,7 @@ void do_blank_screen(int entering_gfx)
if (console_blanked) {
if (blank_state == blank_vesa_wait) {
blank_state = blank_off;
if (vc->vc_sw->con_unblank)
vc->vc_sw->con_blank(vc, vesa_blank_mode, 0);
else
vc->vc_sw->con_blank(vc, vesa_blank_mode + 1, 0);
vc->vc_sw->con_blank(vc, vesa_blank_mode, false);
}
return;
}
@ -4800,10 +4797,7 @@ void do_blank_screen(int entering_gfx)
if (entering_gfx) {
hide_cursor(vc);
save_screen(vc);
if (vc->vc_sw->con_unblank)
vc->vc_sw->con_blank(vc, VESA_NO_BLANKING, 1);
else
vc->vc_sw->con_blank(vc, VESA_VSYNC_SUSPEND, 1);
vc->vc_sw->con_blank(vc, VESA_NO_BLANKING, true);
console_blanked = fg_console + 1;
blank_state = blank_off;
set_origin(vc);
@ -4824,12 +4818,9 @@ void do_blank_screen(int entering_gfx)
save_screen(vc);
/* In case we need to reset origin, blanking hook returns 1 */
if (vc->vc_sw->con_unblank)
i = vc->vc_sw->con_blank(vc, vesa_off_interval ? VESA_NO_BLANKING :
vesa_blank_mode, 0);
else
i = vc->vc_sw->con_blank(vc, vesa_off_interval ? VESA_VSYNC_SUSPEND :
(vesa_blank_mode + 1), 0);
i = vc->vc_sw->con_blank(vc,
vesa_off_interval ? VESA_NO_BLANKING : vesa_blank_mode,
false);
console_blanked = fg_console + 1;
if (i)
set_origin(vc);
@ -4880,15 +4871,9 @@ void do_unblank_screen(int leaving_gfx)
}
console_blanked = 0;
if (vc->vc_sw->con_unblank) {
if (vc->vc_sw->con_unblank(vc, leaving_gfx))
/* Low-level driver cannot restore -> do it ourselves */
update_screen(vc);
} else {
if (vc->vc_sw->con_blank(vc, VESA_NO_BLANKING, leaving_gfx))
/* Low-level driver cannot restore -> do it ourselves */
update_screen(vc);
}
if (vc->vc_sw->con_unblank(vc, leaving_gfx))
/* Low-level driver cannot restore -> do it ourselves */
update_screen(vc);
if (console_blank_hook)
console_blank_hook(0);
set_palette(vc);