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

vgacon: Implement struct consw.con_unblank

Browse Source 
Implement con_unblank from struct consw with the VESA_NO_BLANKING
case from vgacon_blank(). The new function is called vgacon_unblank().
Remove the duplicated code from vgacon_blank().

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:16 +02:00 committed by Helge Deller
parent aa121c4be2
commit d98fbdba7d
1 changed files with 26 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
drivers/video/console/vgacon.c
View File

@ -778,40 +778,45 @@ static bool vgacon_blank(struct vc_data *c, enum vesa_blank_mode blank,
bool mode_switch)
{
switch (blank) {
case VESA_NO_BLANKING: /* Unblank */
if (vga_vesa_blanked) {
vga_vesa_unblank(&vgastate);
vga_vesa_blanked = VESA_NO_BLANKING;
}
if (vga_palette_blanked) {
vga_set_palette(c, color_table);
vga_palette_blanked = false;
return 0;
}
vga_is_gfx = false;
/* Tell console.c that it has to restore the screen itself */
return 1;
case VESA_VSYNC_SUSPEND: /* Normal blanking */
case VESA_NO_BLANKING: /* Normal blanking */
if (!mode_switch && vga_video_type == VIDEO_TYPE_VGAC) {
vga_pal_blank(&vgastate);
vga_palette_blanked = true;
return 0;
return false;
}
vgacon_set_origin(c);
scr_memsetw((void *) vga_vram_base, BLANK,
c->vc_screenbuf_size);
scr_memsetw((void *)vga_vram_base, BLANK, c->vc_screenbuf_size);
if (mode_switch)
vga_is_gfx = true;
return 1;
return true;
default: /* VESA blanking */
if (vga_video_type == VIDEO_TYPE_VGAC) {
vga_vesa_blank(&vgastate, blank - 1);
vga_vesa_blank(&vgastate, blank);
vga_vesa_blanked = blank;
}
return 0;
return false;
}
}
static bool vgacon_unblank(struct vc_data *c, bool mode_switch)
{
if (vga_vesa_blanked) {
vga_vesa_unblank(&vgastate);
vga_vesa_blanked = VESA_NO_BLANKING;
}
if (vga_palette_blanked) {
vga_set_palette(c, color_table);
vga_palette_blanked = false;
return false;
}
vga_is_gfx = false;
/* Tell console.c that it has to restore the screen itself */
return true;
}
/*
* PIO_FONT support.
*
@ -1178,6 +1183,7 @@ const struct consw vga_con = {
.con_scroll = vgacon_scroll,
.con_switch = vgacon_switch,
.con_blank = vgacon_blank,
.con_unblank = vgacon_unblank,
.con_font_set = vgacon_font_set,
.con_font_get = vgacon_font_get,
.con_resize = vgacon_resize,