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

Commit 56f0d64d authored by Antonino A. Daplas's avatar Antonino A. Daplas Committed by Linus Torvalds
Browse files

[PATCH] fbcon: fix complement_mask() with 512 character map 



There is a bug in the complement_mask when you have a 512-character map.
Linux boots to a default 256-character map and most probably your login
profile is loading a 512-character map which results in a bad gpm cursor.

Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 2f6331fa

drivers/video/console/fbcon.c

+8 −1
Original line number Original line Diff line number Diff line
@@ -2048,7 +2048,7 @@ static int fbcon_switch(struct vc_data *vc) 
	struct fbcon_ops *ops;

	struct fbcon_ops *ops;

	struct display *p = &fb_display[vc->vc_num];

	struct display *p = &fb_display[vc->vc_num];

	struct fb_var_screeninfo var;

	struct fb_var_screeninfo var;

	int i, prev_console;

	int i, prev_console, charcnt = 256;





	info = registered_fb[con2fb_map[vc->vc_num]];

	info = registered_fb[con2fb_map[vc->vc_num]];

	ops = info->fbcon_par;

	ops = info->fbcon_par;
@@ -2120,6 +2120,13 @@ static int fbcon_switch(struct vc_data *vc) 




	vc->vc_can_do_color = (fb_get_color_depth(&info->var, &info->fix)!=1);

	vc->vc_can_do_color = (fb_get_color_depth(&info->var, &info->fix)!=1);

	vc->vc_complement_mask = vc->vc_can_do_color ? 0x7700 : 0x0800;

	vc->vc_complement_mask = vc->vc_can_do_color ? 0x7700 : 0x0800;



	if (p->userfont)

		charcnt = FNTCHARCNT(vc->vc_font.data);



	if (charcnt > 256)

		vc->vc_complement_mask <<= 1;



	updatescrollmode(p, info, vc);

	updatescrollmode(p, info, vc);





	switch (p->scrollmode) {

	switch (p->scrollmode) {