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/Graphics/BochsGraphicsAdapter.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/Graphics/BochsGraphicsAdapter.cpp')
-rw-r--r-- | Kernel/Graphics/BochsGraphicsAdapter.cpp | 36 |
1 files changed, 34 insertions, 2 deletions
diff --git a/Kernel/Graphics/BochsGraphicsAdapter.cpp b/Kernel/Graphics/BochsGraphicsAdapter.cpp index d6f42b1662..0fb47c36fe 100644 --- a/Kernel/Graphics/BochsGraphicsAdapter.cpp +++ b/Kernel/Graphics/BochsGraphicsAdapter.cpp @@ -11,6 +11,8 @@ #include <Kernel/Graphics/Bochs.h> #include <Kernel/Graphics/BochsFramebufferDevice.h> #include <Kernel/Graphics/BochsGraphicsAdapter.h> +#include <Kernel/Graphics/Console/FramebufferConsole.h> +#include <Kernel/Graphics/GraphicsManagement.h> #include <Kernel/IO.h> #include <Kernel/PCI/Access.h> #include <Kernel/Process.h> @@ -52,19 +54,24 @@ UNMAP_AFTER_INIT BochsGraphicsAdapter::BochsGraphicsAdapter(PCI::Address pci_add , m_mmio_registers(PCI::get_BAR2(pci_address) & 0xfffffff0) { set_safe_resolution(); + // We assume safe resolutio is 1024x768x32 + m_framebuffer_console = Graphics::FramebufferConsole::initialize(PhysicalAddress(PCI::get_BAR0(pci_address) & 0xfffffff0), 1024, 768, 1024 * sizeof(u32)); + // FIXME: This is a very wrong way to do this... + GraphicsManagement::the().m_console = m_framebuffer_console; } UNMAP_AFTER_INIT void BochsGraphicsAdapter::initialize_framebuffer_devices() { // FIXME: Find a better way to determine default resolution... - m_framebuffer = BochsFramebufferDevice::create(*this, PhysicalAddress(PCI::get_BAR0(pci_address()) & 0xfffffff0), 1024 * 4, 1024, 768); + m_framebuffer_device = BochsFramebufferDevice::create(*this, PhysicalAddress(PCI::get_BAR0(pci_address()) & 0xfffffff0), 1024 * 4, 1024, 768); + m_framebuffer_device->initialize(); } GraphicsDevice::Type BochsGraphicsAdapter::type() const { if (PCI::get_class(pci_address()) == 0x3 && PCI::get_subclass(pci_address()) == 0x0) return Type::VGACompatible; - return Type::Bochs; + return Type::Bochs; } void BochsGraphicsAdapter::set_safe_resolution() @@ -119,8 +126,33 @@ bool BochsGraphicsAdapter::validate_setup_resolution(size_t width, size_t height void BochsGraphicsAdapter::set_y_offset(size_t y_offset) { + if (m_console_enabled) + return; auto registers = map_typed_writable<volatile BochsDisplayMMIORegisters>(m_mmio_registers); registers->bochs_regs.y_offset = y_offset; } +void BochsGraphicsAdapter::enable_consoles() +{ + ScopedSpinLock lock(m_console_mode_switch_lock); + VERIFY(m_framebuffer_console); + m_console_enabled = true; + auto registers = map_typed_writable<volatile BochsDisplayMMIORegisters>(m_mmio_registers); + registers->bochs_regs.y_offset = 0; + if (m_framebuffer_device) + m_framebuffer_device->dectivate_writes(); + m_framebuffer_console->enable(); +} +void BochsGraphicsAdapter::disable_consoles() +{ + ScopedSpinLock lock(m_console_mode_switch_lock); + VERIFY(m_framebuffer_console); + VERIFY(m_framebuffer_device); + m_console_enabled = false; + auto registers = map_typed_writable<volatile BochsDisplayMMIORegisters>(m_mmio_registers); + registers->bochs_regs.y_offset = 0; + m_framebuffer_console->disable(); + m_framebuffer_device->activate_writes(); +} + } |