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.h | |
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.h')
-rw-r--r-- | Kernel/Graphics/BochsGraphicsAdapter.h | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/Kernel/Graphics/BochsGraphicsAdapter.h b/Kernel/Graphics/BochsGraphicsAdapter.h index e2c2b1cdd5..af647e0a87 100644 --- a/Kernel/Graphics/BochsGraphicsAdapter.h +++ b/Kernel/Graphics/BochsGraphicsAdapter.h @@ -8,6 +8,7 @@ #include <AK/String.h> #include <AK/Types.h> +#include <Kernel/Graphics/Console/FramebufferConsole.h> #include <Kernel/Graphics/GraphicsDevice.h> #include <Kernel/PCI/DeviceController.h> #include <Kernel/PhysicalAddress.h> @@ -25,12 +26,16 @@ class BochsGraphicsAdapter final : public GraphicsDevice public: static NonnullRefPtr<BochsGraphicsAdapter> initialize(PCI::Address); virtual ~BochsGraphicsAdapter() = default; + virtual bool framebuffer_devices_initialized() const override { return !m_framebuffer_device.is_null(); } private: // ^GraphicsDevice virtual void initialize_framebuffer_devices() override; virtual Type type() const override; + virtual void enable_consoles() override; + virtual void disable_consoles() override; + explicit BochsGraphicsAdapter(PCI::Address); void set_safe_resolution(); @@ -43,7 +48,10 @@ private: void set_y_offset(size_t); PhysicalAddress m_mmio_registers; - RefPtr<BochsFramebufferDevice> m_framebuffer; + RefPtr<BochsFramebufferDevice> m_framebuffer_device; + RefPtr<Graphics::FramebufferConsole> m_framebuffer_console; + SpinLock<u8> m_console_mode_switch_lock; + bool m_console_enabled { false }; }; } |