6 files changed, 44 insertions, 76 deletions

diff --git a/drivers/video/console/Kconfig b/drivers/video/console/Kconfig
index 06f87b04f207..2f50a80b413e 100644
--- a/drivers/video/console/Kconfig
+++ b/drivers/video/console/Kconfig
@@ -43,22 +43,6 @@ config VGACON_SOFT_SCROLLBACK_SIZE
          buffer.  Each 64KB will give you approximately 16 80x25
          screenfuls of scrollback buffer
 
-config VIDEO_SELECT
-        bool "Video mode selection support"
-        depends on  X86 && VGA_CONSOLE
-        ---help---
-          This enables support for text mode selection on kernel startup. If
-          you want to take advantage of some high-resolution text mode your
-          card's BIOS offers, but the traditional Linux utilities like
-          SVGATextMode don't, you can say Y here and set the mode using the
-          "vga=" option from your boot loader (lilo or loadlin) or set
-          "vga=ask" which brings up a video mode menu on kernel startup. (Try
-          "man bootparam" or see the documentation of your boot loader about
-          how to pass options to the kernel.)
-
-          Read the file <file:Documentation/svga.txt> for more information
-          about the Video mode selection support. If unsure, say N.
-
 config MDA_CONSOLE
         depends on !M68K && !PARISC && ISA
         tristate "MDA text console (dual-headed) (EXPERIMENTAL)"
diff --git a/drivers/video/console/fbcon.c b/drivers/video/console/fbcon.c
index c6299e8a041d..64b3d30027b8 100644
--- a/drivers/video/console/fbcon.c
+++ b/drivers/video/console/fbcon.c
@@ -1855,8 +1855,6 @@ static int fbcon_scroll(struct vc_data *vc, int t, int b, int dir,
         struct fb_info *info = registered_fb[con2fb_map[vc->vc_num]];
         struct display *p = &fb_display[vc->vc_num];
         int scroll_partial = info->flags & FBINFO_PARTIAL_PAN_OK;
-        unsigned short saved_ec;
-        int ret;
 
         if (fbcon_is_inactive(vc, info))
                 return -EINVAL;
@@ -1869,11 +1867,6 @@ static int fbcon_scroll(struct vc_data *vc, int t, int b, int dir,
          *           whole screen (prevents flicker).
          */
 
-        saved_ec = vc->vc_video_erase_char;
-        vc->vc_video_erase_char = vc->vc_scrl_erase_char;
-
-        ret = 0;
-
         switch (dir) {
         case SM_UP:
                 if (count > vc->vc_rows)        /* Maximum realistic size */
@@ -1890,9 +1883,9 @@ static int fbcon_scroll(struct vc_data *vc, int t, int b, int dir,
                         scr_memsetw((unsigned short *) (vc->vc_origin +
                                                         vc->vc_size_row *
                                                         (b - count)),
-                                    vc->vc_scrl_erase_char,
+                                    vc->vc_video_erase_char,
                                     vc->vc_size_row * count);
-                        ret = 1;
+                        return 1;
                         break;
 
                 case SCROLL_WRAP_MOVE:
@@ -1962,10 +1955,9 @@ static int fbcon_scroll(struct vc_data *vc, int t, int b, int dir,
                         scr_memsetw((unsigned short *) (vc->vc_origin +
                                                         vc->vc_size_row *
                                                         (b - count)),
-                                    vc->vc_scrl_erase_char,
+                                    vc->vc_video_erase_char,
                                     vc->vc_size_row * count);
-                        ret = 1;
-                        break;
+                        return 1;
                 }
                 break;
 
@@ -1982,9 +1974,9 @@ static int fbcon_scroll(struct vc_data *vc, int t, int b, int dir,
                         scr_memsetw((unsigned short *) (vc->vc_origin +
                                                         vc->vc_size_row *
                                                         t),
-                                    vc->vc_scrl_erase_char,
+                                    vc->vc_video_erase_char,
                                     vc->vc_size_row * count);
-                        ret = 1;
+                        return 1;
                         break;
 
                 case SCROLL_WRAP_MOVE:
@@ -2052,15 +2044,12 @@ static int fbcon_scroll(struct vc_data *vc, int t, int b, int dir,
                         scr_memsetw((unsigned short *) (vc->vc_origin +
                                                         vc->vc_size_row *
                                                         t),
-                                    vc->vc_scrl_erase_char,
+                                    vc->vc_video_erase_char,
                                     vc->vc_size_row * count);
-                        ret = 1;
-                        break;
+                        return 1;
                 }
-                break;
         }
-        vc->vc_video_erase_char = saved_ec;
-        return ret;
+        return 0;
 }
 
 
@@ -2400,11 +2389,15 @@ static int fbcon_blank(struct vc_data *vc, int blank, int mode_switch)
 
         if (!fbcon_is_inactive(vc, info)) {
                 if (ops->blank_state != blank) {
+                        int ret = 1;
+
                         ops->blank_state = blank;
                         fbcon_cursor(vc, blank ? CM_ERASE : CM_DRAW);
                         ops->cursor_flash = (!blank);
 
-                        if (fb_blank(info, blank))
+                        if (info->fbops->fb_blank)
+                                ret = info->fbops->fb_blank(blank, info);
+                        if (ret)
                                 fbcon_generic_blank(vc, info, blank);
                 }
 
@@ -2518,9 +2511,6 @@ 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_scrl_erase_char;
-                        vc->vc_scrl_erase_char =
-                            ((c & 0xFE00) >> 1) | (c & 0xFF);
                         vc->vc_attr >>= 1;
                 }
         } else if (!vc->vc_hi_font_mask && cnt == 512) {
@@ -2551,14 +2541,9 @@ 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_scrl_erase_char;
-                                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;
-                        }
                 }
 
         }
@@ -2992,8 +2977,8 @@ static void fbcon_set_all_vcs(struct fb_info *info)
                 p = &fb_display[vc->vc_num];
                 set_blitting_type(vc, info);
                 var_to_display(p, &info->var, info);
-                cols = FBCON_SWAP(p->rotate, info->var.xres, info->var.yres);
-                rows = FBCON_SWAP(p->rotate, info->var.yres, info->var.xres);
+                cols = FBCON_SWAP(ops->rotate, info->var.xres, info->var.yres);
+                rows = FBCON_SWAP(ops->rotate, info->var.yres, info->var.xres);
                 cols /= vc->vc_font.width;
                 rows /= vc->vc_font.height;
                 vc_resize(vc, cols, rows);
@@ -3588,8 +3573,8 @@ static int __init fb_console_init(void)
 
         acquire_console_sem();
         fb_register_client(&fbcon_event_notifier);
-        fbcon_device = device_create_drvdata(fb_class, NULL, MKDEV(0, 0),
-                                             NULL, "fbcon");
+        fbcon_device = device_create(fb_class, NULL, MKDEV(0, 0), NULL,
+                                     "fbcon");
 
         if (IS_ERR(fbcon_device)) {
                 printk(KERN_WARNING "Unable to create device "
diff --git a/drivers/video/console/fbcon.h b/drivers/video/console/fbcon.h
index a6e38e9ea73f..89a346880ec0 100644
--- a/drivers/video/console/fbcon.h
+++ b/drivers/video/console/fbcon.h
@@ -110,7 +110,7 @@ static inline int mono_col(const struct fb_info *info)
         __u32 max_len;
         max_len = max(info->var.green.length, info->var.red.length);
         max_len = max(info->var.blue.length, max_len);
-        return ~(0xfff << (max_len & 0xff));
+        return (~(0xfff << max_len)) & 0xff;
 }
 
 static inline int attr_col_ec(int shift, struct vc_data *vc,
diff --git a/drivers/video/console/mdacon.c b/drivers/video/console/mdacon.c
index 9901064199bd..dd3eaaad4441 100644
--- a/drivers/video/console/mdacon.c
+++ b/drivers/video/console/mdacon.c
@@ -533,7 +533,7 @@ static void mdacon_cursor(struct vc_data *c, int mode)
 
 static int mdacon_scroll(struct vc_data *c, int t, int b, int dir, int lines)
 {
-        u16 eattr = mda_convert_attr(c->vc_scrl_erase_char);
+        u16 eattr = mda_convert_attr(c->vc_video_erase_char);
 
         if (!lines)
                 return 0;
diff --git a/drivers/video/console/sticon.c b/drivers/video/console/sticon.c
index 4055dbdd1b42..491c1c1baf4c 100644
--- a/drivers/video/console/sticon.c
+++ b/drivers/video/console/sticon.c
@@ -170,12 +170,12 @@ static int sticon_scroll(struct vc_data *conp, int t, int b, int dir, int count)
     switch (dir) {
     case SM_UP:
         sti_bmove(sti, t + count, 0, t, 0, b - t - count, conp->vc_cols);
-        sti_clear(sti, b - count, 0, count, conp->vc_cols, conp->vc_scrl_erase_char);
+        sti_clear(sti, b - count, 0, count, conp->vc_cols, conp->vc_video_erase_char);
         break;
 
     case SM_DOWN:
         sti_bmove(sti, t, 0, t + count, 0, b - t - count, conp->vc_cols);
-        sti_clear(sti, t, 0, count, conp->vc_cols, conp->vc_scrl_erase_char);
+        sti_clear(sti, t, 0, count, conp->vc_cols, conp->vc_video_erase_char);
         break;
     }
 
diff --git a/drivers/video/console/vgacon.c b/drivers/video/console/vgacon.c
index bd1f57b259d9..448d209a0bf2 100644
--- a/drivers/video/console/vgacon.c
+++ b/drivers/video/console/vgacon.c
@@ -239,8 +239,7 @@ static void vgacon_restore_screen(struct vc_data *c)
 
 static int vgacon_scrolldelta(struct vc_data *c, int lines)
 {
-        int start, end, count, soff, diff;
-        void *d, *s;
+        int start, end, count, soff;
 
         if (!lines) {
                 c->vc_visible_origin = c->vc_origin;
@@ -287,29 +286,29 @@ static int vgacon_scrolldelta(struct vc_data *c, int lines)
         if (count > c->vc_rows)
                 count = c->vc_rows;
 
-        diff = c->vc_rows - count;
+        if (count) {
+                int copysize;
 
-        d = (void *) c->vc_origin;
-        s = (void *) c->vc_screenbuf;
+                int diff = c->vc_rows - count;
+                void *d = (void *) c->vc_origin;
+                void *s = (void *) c->vc_screenbuf;
 
-        while (count--) {
-                scr_memcpyw(d, vgacon_scrollback + soff, c->vc_size_row);
-                d += c->vc_size_row;
-                soff += c->vc_size_row;
+                count *= c->vc_size_row;
+                /* how much memory to end of buffer left? */
+                copysize = min(count, vgacon_scrollback_size - soff);
+                scr_memcpyw(d, vgacon_scrollback + soff, copysize);
+                d += copysize;
+                count -= copysize;
 
-                if (soff >= vgacon_scrollback_size)
-                        soff = 0;
-        }
+                if (count) {
+                        scr_memcpyw(d, vgacon_scrollback, count);
+                        d += count;
+                }
 
-        if (diff == c->vc_rows) {
+                if (diff)
+                        scr_memcpyw(d, s, diff * c->vc_size_row);
+        } else
                 vgacon_cursor(c, CM_MOVE);
-        } else {
-                while (diff--) {
-                        scr_memcpyw(d, s, c->vc_size_row);
-                        d += c->vc_size_row;
-                        s += c->vc_size_row;
-                }
-        }
 
         return 1;
 }
@@ -1350,7 +1349,7 @@ static int vgacon_scroll(struct vc_data *c, int t, int b, int dir,
                 } else
                         c->vc_origin += delta;
                 scr_memsetw((u16 *) (c->vc_origin + c->vc_screenbuf_size -
-                                     delta), c->vc_scrl_erase_char,
+                                     delta), c->vc_video_erase_char,
                             delta);
         } else {
                 if (oldo - delta < vga_vram_base) {
@@ -1363,7 +1362,7 @@ static int vgacon_scroll(struct vc_data *c, int t, int b, int dir,
                 } else
                         c->vc_origin -= delta;
                 c->vc_scr_end = c->vc_origin + c->vc_screenbuf_size;
-                scr_memsetw((u16 *) (c->vc_origin), c->vc_scrl_erase_char,
+                scr_memsetw((u16 *) (c->vc_origin), c->vc_video_erase_char,
                             delta);
         }
         c->vc_scr_end = c->vc_origin + c->vc_screenbuf_size;