diff options
author | Andy Whitcroft <apw@canonical.com> | 2010-07-29 16:36:31 +0100 |
---|---|---|
committer | John Rigby <john.rigby@linaro.org> | 2011-06-26 13:58:41 +0100 |
commit | b31b80a2990e00c507961eb2296abafe4247746f (patch) | |
tree | ec051a6d36acf7017860a966b2d36f647062f5ed | |
parent | dbe0a4e063c6b6a760f3471429a3d970ed36e6fd (diff) |
UBUNTU: SAUCE: vt -- allow grub to request automatic vt_handoff
Grub may be able to select a graphics mode and paint a splash screen
for us. If so it needs to be able to tell us it has done so. Add
support for detecting a new graphics mode selected bit in the
screen_info passed over at boot. Use this to automatically enable
vt_handoff mode.
Signed-off-by: Andy Whitcroft <apw@canonical.com>
Acked-by: Stefan Bader <stefan.bader@canonical.com>
Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
-rw-r--r-- | drivers/tty/vt/vt.c | 6 | ||||
-rw-r--r-- | include/linux/screen_info.h | 1 |
2 files changed, 7 insertions, 0 deletions
diff --git a/drivers/tty/vt/vt.c b/drivers/tty/vt/vt.c index d7225191dc3..725a6ce173d 100644 --- a/drivers/tty/vt/vt.c +++ b/drivers/tty/vt/vt.c @@ -2891,6 +2891,12 @@ static int __init con_init(void) struct vc_data *vc; unsigned int currcons = 0, i; + if (screen_info.flags & VIDEO_FLAGS_HANDOFF) { + printk(KERN_INFO "vt handoff: grub requested handoff (vt#8)\n"); + if (vt_handoff == -1) + vt_handoff = 8; + } + console_lock(); if (conswitchp) diff --git a/include/linux/screen_info.h b/include/linux/screen_info.h index 899fbb487c9..e699dd416f9 100644 --- a/include/linux/screen_info.h +++ b/include/linux/screen_info.h @@ -67,6 +67,7 @@ struct screen_info { #define VIDEO_TYPE_EFI 0x70 /* EFI graphic mode */ #define VIDEO_FLAGS_NOCURSOR (1 << 0) /* The video mode has no cursor set */ +#define VIDEO_FLAGS_HANDOFF (1 << 1) /* Video buffer is alredy painted */ #ifdef __KERNEL__ extern struct screen_info screen_info; |