Skip to content

Commit

Permalink
[PATCH] allow early printk to use more than 25 lines
Browse files Browse the repository at this point in the history
Allow early printk code to take advantage of the full size of the screen, not
just the first 25 lines.

Signed-off-by: Jan Beulich <jbeulich@novell.com>
Acked-by: Andi Kleen <ak@muc.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
  • Loading branch information
Jan Beulich authored and Linus Torvalds committed Jun 23, 2005
1 parent 7fbb4f6 commit 799d19f
Showing 1 changed file with 10 additions and 3 deletions.
13 changes: 10 additions & 3 deletions arch/x86_64/kernel/early_printk.c
Original file line number Diff line number Diff line change
Expand Up @@ -2,20 +2,24 @@
#include <linux/kernel.h>
#include <linux/init.h>
#include <linux/string.h>
#include <linux/tty.h>
#include <asm/io.h>
#include <asm/processor.h>

/* Simple VGA output */

#ifdef __i386__
#include <asm/setup.h>
#define VGABASE (__ISA_IO_base + 0xb8000)
#else
#include <asm/bootsetup.h>
#define VGABASE ((void __iomem *)0xffffffff800b8000UL)
#endif

#define MAX_YPOS 25
#define MAX_XPOS 80
#define MAX_YPOS max_ypos
#define MAX_XPOS max_xpos

static int max_ypos = 25, max_xpos = 80;
static int current_ypos = 1, current_xpos = 0;

static void early_vga_write(struct console *con, const char *str, unsigned n)
Expand Down Expand Up @@ -196,7 +200,10 @@ int __init setup_early_printk(char *opt)
} else if (!strncmp(buf, "ttyS", 4)) {
early_serial_init(buf);
early_console = &early_serial_console;
} else if (!strncmp(buf, "vga", 3)) {
} else if (!strncmp(buf, "vga", 3)
&& SCREEN_INFO.orig_video_isVGA == 1) {
max_xpos = SCREEN_INFO.orig_video_cols;
max_ypos = SCREEN_INFO.orig_video_lines;
early_console = &early_vga_console;
}
early_console_initialized = 1;
Expand Down

0 comments on commit 799d19f

Please sign in to comment.