aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/video/console/fbcon.c9
1 files changed, 8 insertions, 1 deletions
diff --git a/drivers/video/console/fbcon.c b/drivers/video/console/fbcon.c
index bcea87c3cc06..c024ffd0266d 100644
--- a/drivers/video/console/fbcon.c
+++ b/drivers/video/console/fbcon.c
@@ -2048,7 +2048,7 @@ static int fbcon_switch(struct vc_data *vc)
2048 struct fbcon_ops *ops; 2048 struct fbcon_ops *ops;
2049 struct display *p = &fb_display[vc->vc_num]; 2049 struct display *p = &fb_display[vc->vc_num];
2050 struct fb_var_screeninfo var; 2050 struct fb_var_screeninfo var;
2051 int i, prev_console; 2051 int i, prev_console, charcnt = 256;
2052 2052
2053 info = registered_fb[con2fb_map[vc->vc_num]]; 2053 info = registered_fb[con2fb_map[vc->vc_num]];
2054 ops = info->fbcon_par; 2054 ops = info->fbcon_par;
@@ -2120,6 +2120,13 @@ static int fbcon_switch(struct vc_data *vc)
2120 2120
2121 vc->vc_can_do_color = (fb_get_color_depth(&info->var, &info->fix)!=1); 2121 vc->vc_can_do_color = (fb_get_color_depth(&info->var, &info->fix)!=1);
2122 vc->vc_complement_mask = vc->vc_can_do_color ? 0x7700 : 0x0800; 2122 vc->vc_complement_mask = vc->vc_can_do_color ? 0x7700 : 0x0800;
2123
2124 if (p->userfont)
2125 charcnt = FNTCHARCNT(vc->vc_font.data);
2126
2127 if (charcnt > 256)
2128 vc->vc_complement_mask <<= 1;
2129
2123 updatescrollmode(p, info, vc); 2130 updatescrollmode(p, info, vc);
2124 2131
2125 switch (p->scrollmode) { 2132 switch (p->scrollmode) {