setup: enable framebuffer initialization

Signed-off-by: Pawel Wieczorkiewicz <[email protected]>
KernelTestFramework · Feb 19, 2022 · f431c71 · f431c71
1 parent 3486ee9
commit f431c71
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 3 deletions.
diff --git a/arch/x86/boot/boot.S b/arch/x86/boot/boot.S
@@ -33,7 +33,7 @@ SECTION(.multiboot, "a", 4)
 #define MULTIBOOT_VIDEO_MODE_GFX 0
 #define MULTIBOOT_VIDEO_MODE_TEXT 1
 
-#define MULTIBOOT_MODE_TYPE MULTIBOOT_VIDEO_MODE_TEXT
+#define MULTIBOOT_MODE_TYPE MULTIBOOT_VIDEO_MODE_GFX
 
 #define MULTIBOOT_HEADER_ADDR      0
 #define MULTIBOOT_LOAD_ADDRESS     0

diff --git a/common/setup.c b/common/setup.c
@@ -50,6 +50,7 @@
 #include <smp/mptables.h>
 #include <smp/smp.h>
 
+#include <drivers/fb.h>
 #include <drivers/hpet.h>
 #include <drivers/pic.h>
 #include <drivers/pit.h>
@@ -137,6 +138,8 @@ static void display_cpu_info(void) {
         printk("Frequency: %lu MHz\n", freq / MHZ(1));
 }
 
+static void display_banner(void) { draw_logo(); }
+
 static void __text_init init_vga_console(void) {
     if (!boot_flags.vga)
         return;
@@ -194,6 +197,11 @@ void __noreturn __text_init kernel_start(uint32_t multiboot_magic,
     if (opt_debug)
         dump_pagetables();
 
+    if (init_framebuffer(mbi))
+        display_banner();
+    else
+        init_vga_console();
+
     init_percpu();
 
     init_traps(get_bsp_cpu_id());
@@ -213,8 +221,6 @@ void __noreturn __text_init kernel_start(uint32_t multiboot_magic,
             BUG();
     }
 
-    init_vga_console();
-
     init_apic(get_bsp_cpu_id(), APIC_MODE_XAPIC);
 
     init_tasks();

diff --git a/grub/boot/grub/grub.cfg b/grub/boot/grub/grub.cfg
@@ -1,6 +1,8 @@
 set timeout=0
 set default=0
 
+insmod all_video
+
 serial --speed=115200 --word=8 --parity=no --stop=1
 terminal_input --append serial
 terminal_output --append serial