aboutsummaryrefslogtreecommitdiff
path: root/arch/x86/boot
diff options
context:
space:
mode:
authorH. Peter Anvin <hpa@zytor.com>2008-01-30 13:33:03 +0100
committerIngo Molnar <mingo@elte.hu>2008-01-30 13:33:03 +0100
commit1a8514e04e3f0249a75f66225e99cdf48d305be7 (patch)
treebb012b0f010d241d8d87f8314a76f6c18c3fd411 /arch/x86/boot
parentb710763608f1bfc8d4cd346e508f3f4878af361e (diff)
x86 setup: push video mode setup as late as possible
Push video mode setup as late as possible; messages issued through the BIOS interface after video mode setup will either not be seen (for framebuffer modes) or will screw up the cursor (for text modes.) In particular, this makes the EDD probing message show up correctly. Signed-off-by: H. Peter Anvin <hpa@zytor.com> Signed-off-by: Ingo Molnar <mingo@elte.hu> Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'arch/x86/boot')
-rw-r--r--arch/x86/boot/main.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/arch/x86/boot/main.c b/arch/x86/boot/main.c
index 1f95750ede2..22ca62ba40c 100644
--- a/arch/x86/boot/main.c
+++ b/arch/x86/boot/main.c
@@ -131,9 +131,6 @@ void main(void)
/* Set keyboard repeat rate (why?) */
keyboard_set_repeat();
- /* Set the video mode */
- set_video();
-
/* Query MCA information */
query_mca();
@@ -154,6 +151,10 @@ void main(void)
#if defined(CONFIG_EDD) || defined(CONFIG_EDD_MODULE)
query_edd();
#endif
+
+ /* Set the video mode */
+ set_video();
+
/* Do the last things and invoke protected mode */
go_to_protected_mode();
}