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>

diff --git a/arch/x86/boot/main.c b/arch/x86/boot/main.c
index 1f95750ede28461c41d6c7247723254edb06926e..22ca62ba40c8d8615067b7f7bec4d17d44bfa5b5 100644 (file)
--- 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();
 }