Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7fe3915a authored by Jan Engelhardt's avatar Jan Engelhardt Committed by Linus Torvalds
Browse files

vt/fbcon: update scrl_erase_char after 256/512-glyph font switch 



Addendum to commit c9e587ab ("vt: fix
background color on line feed").

vc->vc_scrl_erase_char was not updated when fbcon switches between
256- and 512-glyph fonts.

Signed-off-by: default avatarJan Engelhardt <jengelh@medozas.de>
Acked-by: default avatarDavid S. Miller <davem@davemloft.net>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 9fb1f68d

drivers/video/console/fbcon.c

+9 −1
Original line number Diff line number Diff line
@@ -2507,6 +2507,9 @@ static int fbcon_do_set_font(struct vc_data *vc, int w, int h, 
			c = vc->vc_video_erase_char;

			vc->vc_video_erase_char =

			    ((c & 0xfe00) >> 1) | (c & 0xff);

			c = vc->vc_def_color;

			vc->vc_scrl_erase_char =

			    ((c & 0xFE00) >> 1) | (c & 0xFF);

			vc->vc_attr >>= 1;

		}

	} else if (!vc->vc_hi_font_mask && cnt == 512) {
@@ -2537,9 +2540,14 @@ static int fbcon_do_set_font(struct vc_data *vc, int w, int h, 
			if (vc->vc_can_do_color) {

				vc->vc_video_erase_char =

				    ((c & 0xff00) << 1) | (c & 0xff);

				c = vc->vc_def_color;

				vc->vc_scrl_erase_char =

				    ((c & 0xFF00) << 1) | (c & 0xFF);

				vc->vc_attr <<= 1;

			} else

			} else {

				vc->vc_video_erase_char = c & ~0x100;

				vc->vc_scrl_erase_char = c & ~0x100;

			}

		}



	}