Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 15100
b: refs/heads/master
c: 56f0d64
h: refs/heads/master
v: v3
  • Loading branch information
Antonino A. Daplas authored and Linus Torvalds committed Dec 13, 2005
1 parent 3eea8e8 commit 726f83a
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 2 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 2f6331faf58a4727a9f1138cd6db30d05b124220
refs/heads/master: 56f0d64de80733bda54d1cfa7ac0c736ab2de33b
9 changes: 8 additions & 1 deletion trunk/drivers/video/console/fbcon.c
Original file line number Diff line number Diff line change
Expand Up @@ -2048,7 +2048,7 @@ static int fbcon_switch(struct vc_data *vc)
struct fbcon_ops *ops;
struct display *p = &fb_display[vc->vc_num];
struct fb_var_screeninfo var;
int i, prev_console;
int i, prev_console, charcnt = 256;

info = registered_fb[con2fb_map[vc->vc_num]];
ops = info->fbcon_par;
Expand Down Expand Up @@ -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_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);

switch (p->scrollmode) {
Expand Down

0 comments on commit 726f83a

Please sign in to comment.