Merge branch 'console-fixes' into drm-next

(not the fbcon maintainer pull 2)

fix bug in vgacon on bootup and fbcon losing fonts on startup.

* console-fixes: (50 commits)
  fbcon: don't lose the console font across generic->chip driver switch
  vgacon/vt: clear buffer attributes when we load a 512 character font (v2)

2 files changed, 25 insertions, 11 deletions

diff --git a/drivers/video/console/fbcon.c b/drivers/video/console/fbcon.c
index 2e2d959acae6..501c599e7549 100644
--- a/drivers/video/console/fbcon.c
+++ b/drivers/video/console/fbcon.c
@@ -1017,7 +1017,7 @@ static const char *fbcon_startup(void)
         }
 
         /* Setup default font */
-        if (!p->fontdata) {
+        if (!p->fontdata && !vc->vc_font.data) {
                 if (!fontname[0] || !(font = find_font(fontname)))
                         font = get_default_font(info->var.xres,
                                                 info->var.yres,
@@ -1027,6 +1027,8 @@ static const char *fbcon_startup(void)
                 vc->vc_font.height = font->height;
                 vc->vc_font.data = (void *)(p->fontdata = font->data);
                 vc->vc_font.charcount = 256; /* FIXME  Need to support more fonts */
+        } else {
+                p->fontdata = vc->vc_font.data;
         }
 
         cols = FBCON_SWAP(ops->rotate, info->var.xres, info->var.yres);
@@ -1186,9 +1188,9 @@ static void fbcon_init(struct vc_data *vc, int init)
         ops->p = &fb_display[fg_console];
 }
 
-static void fbcon_free_font(struct display *p)
+static void fbcon_free_font(struct display *p, bool freefont)
 {
-        if (p->userfont && p->fontdata && (--REFCOUNT(p->fontdata) == 0))
+        if (freefont && p->userfont && p->fontdata && (--REFCOUNT(p->fontdata) == 0))
                 kfree(p->fontdata - FONT_EXTRA_WORDS * sizeof(int));
         p->fontdata = NULL;
         p->userfont = 0;
@@ -1200,8 +1202,8 @@ static void fbcon_deinit(struct vc_data *vc)
         struct fb_info *info;
         struct fbcon_ops *ops;
         int idx;
+        bool free_font = true;
 
-        fbcon_free_font(p);
         idx = con2fb_map[vc->vc_num];
 
         if (idx == -1)
@@ -1212,6 +1214,8 @@ static void fbcon_deinit(struct vc_data *vc)
         if (!info)
                 goto finished;
 
+        if (info->flags & FBINFO_MISC_FIRMWARE)
+                free_font = false;
         ops = info->fbcon_par;
 
         if (!ops)
@@ -1223,6 +1227,8 @@ static void fbcon_deinit(struct vc_data *vc)
         ops->flags &= ~FBCON_FLAGS_INIT;
 finished:
 
+        fbcon_free_font(p, free_font);
+
         if (!con_is_bound(&fb_con))
                 fbcon_exit();
 
diff --git a/drivers/video/console/vgacon.c b/drivers/video/console/vgacon.c
index d449a74d4a31..5855d17d19ac 100644
--- a/drivers/video/console/vgacon.c
+++ b/drivers/video/console/vgacon.c
@@ -1064,7 +1064,7 @@ static int vgacon_do_font_op(struct vgastate *state,char *arg,int set,int ch512)
         unsigned short video_port_status = vga_video_port_reg + 6;
         int font_select = 0x00, beg, i;
         char *charmap;
-        
+        bool clear_attribs = false;
         if (vga_video_type != VIDEO_TYPE_EGAM) {
                 charmap = (char *) VGA_MAP_MEM(colourmap, 0);
                 beg = 0x0e;
@@ -1169,12 +1169,6 @@ static int vgacon_do_font_op(struct vgastate *state,char *arg,int set,int ch512)
 
         /* if 512 char mode is already enabled don't re-enable it. */
         if ((set) && (ch512 != vga_512_chars)) {
-                /* attribute controller */
-                for (i = 0; i < MAX_NR_CONSOLES; i++) {
-                        struct vc_data *c = vc_cons[i].d;
-                        if (c && c->vc_sw == &vga_con)
-                                c->vc_hi_font_mask = ch512 ? 0x0800 : 0;
-                }
                 vga_512_chars = ch512;
                 /* 256-char: enable intensity bit
                    512-char: disable intensity bit */
@@ -1185,8 +1179,22 @@ static int vgacon_do_font_op(struct vgastate *state,char *arg,int set,int ch512)
                    it means, but it works, and it appears necessary */
                 inb_p(video_port_status);
                 vga_wattr(state->vgabase, VGA_AR_ENABLE_DISPLAY, 0);    
+                clear_attribs = true;
         }
         raw_spin_unlock_irq(&vga_lock);
+
+        if (clear_attribs) {
+                for (i = 0; i < MAX_NR_CONSOLES; i++) {
+                        struct vc_data *c = vc_cons[i].d;
+                        if (c && c->vc_sw == &vga_con) {
+                                /* force hi font mask to 0, so we always clear
+                                   the bit on either transition */
+                                c->vc_hi_font_mask = 0x00;
+                                clear_buffer_attributes(c);
+                                c->vc_hi_font_mask = ch512 ? 0x0800 : 0;
+                        }
+                }
+        }
         return 0;
 }