diff options
| author | Liav A <liavalb@gmail.com> | 2021-04-16 22:58:51 +0300 |
|---|---|---|
| committer | Andreas Kling <kling@serenityos.org> | 2021-05-16 19:58:33 +0200 |
| commit | 20743e8aede1de46195dd61ad18002cd52db7d3a (patch) | |
| tree | 49ea710e88949b49c136b0b3b793059c24f6daa1 /Kernel/CommandLine.cpp | |
| parent | dac129e10bdef313dff65b34f1fa17608d3608c2 (diff) | |
| download | serenity-20743e8aede1de46195dd61ad18002cd52db7d3a.zip | |
Kernel/Graphics + SystemServer: Support text mode properly
As we removed the support of VBE modesetting that was done by GRUB early
on boot, we need to determine if we can modeset the resolution with our
drivers, and if not, we should enable text mode and ensure that
SystemServer knows about it too.
Also, SystemServer should first check if there's a framebuffer device
node, which is an indication that text mode was not even if it was
requested. Then, if it doesn't find it, it should check what boot_mode
argument the user specified (in case it's self-test). This way if we
try to use bochs-display device (which is not VGA compatible) and
request a text mode, it will not honor the request and will continue
with graphical mode.
Also try to print critical messages with mininum memory allocations
possible.
In LibVT, We make the implementation flexible for kernel-specific
methods that are implemented in ConsoleImpl class.
Diffstat (limited to 'Kernel/CommandLine.cpp')
| -rw-r--r-- | Kernel/CommandLine.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Kernel/CommandLine.cpp b/Kernel/CommandLine.cpp index 2cfb9b406e..6740fad3c0 100644 --- a/Kernel/CommandLine.cpp +++ b/Kernel/CommandLine.cpp @@ -171,8 +171,8 @@ UNMAP_AFTER_INIT AHCIResetMode CommandLine::ahci_reset_mode() const UNMAP_AFTER_INIT BootMode CommandLine::boot_mode() const { const auto boot_mode = lookup("boot_mode").value_or("graphical"); - if (boot_mode == "text") { - return BootMode::Text; + if (boot_mode == "no-fbdev") { + return BootMode::NoFramebufferDevices; } else if (boot_mode == "self-test") { return BootMode::SelfTest; } else if (boot_mode == "graphical") { @@ -181,10 +181,10 @@ UNMAP_AFTER_INIT BootMode CommandLine::boot_mode() const PANIC("Unknown BootMode: {}", boot_mode); } -UNMAP_AFTER_INIT bool CommandLine::is_text_mode() const +UNMAP_AFTER_INIT bool CommandLine::is_no_framebuffer_devices_mode() const { const auto mode = boot_mode(); - return mode == BootMode::Text || mode == BootMode::SelfTest; + return mode == BootMode::NoFramebufferDevices || mode == BootMode::SelfTest; } String CommandLine::userspace_init() const |