diff --git a/Kernel/CMakeLists.txt b/Kernel/CMakeLists.txt index 5468444533..9fa0272813 100644 --- a/Kernel/CMakeLists.txt +++ b/Kernel/CMakeLists.txt @@ -76,7 +76,7 @@ set(KERNEL_SOURCES Graphics/FramebufferDevice.cpp Graphics/GraphicsManagement.cpp Graphics/Intel/NativeGraphicsAdapter.cpp - Graphics/VirtIOGPU/FrameBufferDevice.cpp + Graphics/VirtIOGPU/FramebufferDevice.cpp Graphics/VirtIOGPU/Console.cpp Graphics/VirtIOGPU/GPU.cpp Graphics/VirtIOGPU/GraphicsAdapter.cpp diff --git a/Kernel/Graphics/VirtIOGPU/Console.cpp b/Kernel/Graphics/VirtIOGPU/Console.cpp index 880aa93e43..2ecefebf67 100644 --- a/Kernel/Graphics/VirtIOGPU/Console.cpp +++ b/Kernel/Graphics/VirtIOGPU/Console.cpp @@ -5,7 +5,7 @@ */ #include -#include +#include #include namespace Kernel::Graphics::VirtIOGPU { @@ -30,12 +30,12 @@ void DirtyRect::union_rect(size_t x, size_t y, size_t width, size_t height) } } -NonnullRefPtr Console::initialize(RefPtr const& framebuffer_device) +NonnullRefPtr Console::initialize(RefPtr const& framebuffer_device) { return adopt_ref(*new Console(framebuffer_device)); } -Console::Console(RefPtr const& framebuffer_device) +Console::Console(RefPtr const& framebuffer_device) : GenericFramebufferConsole(framebuffer_device->width(), framebuffer_device->height(), framebuffer_device->pitch()) , m_framebuffer_device(framebuffer_device) { diff --git a/Kernel/Graphics/VirtIOGPU/Console.h b/Kernel/Graphics/VirtIOGPU/Console.h index db6fe13376..16dfb2bac7 100644 --- a/Kernel/Graphics/VirtIOGPU/Console.h +++ b/Kernel/Graphics/VirtIOGPU/Console.h @@ -32,7 +32,7 @@ private: class Console final : public GenericFramebufferConsole { public: - static NonnullRefPtr initialize(RefPtr const&); + static NonnullRefPtr initialize(RefPtr const&); virtual void set_resolution(size_t width, size_t height, size_t pitch) override; virtual void flush(size_t x, size_t y, size_t width, size_t height) override; @@ -42,8 +42,8 @@ private: void enqueue_refresh_timer(); virtual u8* framebuffer_data() override; - Console(RefPtr const&); - RefPtr m_framebuffer_device; + Console(RefPtr const&); + RefPtr m_framebuffer_device; DirtyRect m_dirty_rect; }; diff --git a/Kernel/Graphics/VirtIOGPU/FrameBufferDevice.cpp b/Kernel/Graphics/VirtIOGPU/FramebufferDevice.cpp similarity index 92% rename from Kernel/Graphics/VirtIOGPU/FrameBufferDevice.cpp rename to Kernel/Graphics/VirtIOGPU/FramebufferDevice.cpp index 9903b49d7a..f6d99ee074 100644 --- a/Kernel/Graphics/VirtIOGPU/FrameBufferDevice.cpp +++ b/Kernel/Graphics/VirtIOGPU/FramebufferDevice.cpp @@ -5,12 +5,12 @@ */ #include -#include +#include #include namespace Kernel::Graphics::VirtIOGPU { -FrameBufferDevice::FrameBufferDevice(GPU& virtio_gpu, ScanoutID scanout) +FramebufferDevice::FramebufferDevice(GPU& virtio_gpu, ScanoutID scanout) : BlockDevice(29, GraphicsManagement::the().allocate_minor_device_number()) , m_gpu(virtio_gpu) , m_scanout(scanout) @@ -22,11 +22,11 @@ FrameBufferDevice::FrameBufferDevice(GPU& virtio_gpu, ScanoutID scanout) } } -FrameBufferDevice::~FrameBufferDevice() +FramebufferDevice::~FramebufferDevice() { } -KResult FrameBufferDevice::create_framebuffer() +KResult FramebufferDevice::create_framebuffer() { // First delete any existing framebuffers to free the memory first m_framebuffer = nullptr; @@ -53,7 +53,7 @@ KResult FrameBufferDevice::create_framebuffer() return KSuccess; } -void FrameBufferDevice::create_buffer(Buffer& buffer, size_t framebuffer_offset, size_t framebuffer_size) +void FramebufferDevice::create_buffer(Buffer& buffer, size_t framebuffer_offset, size_t framebuffer_size) { buffer.framebuffer_offset = framebuffer_offset; buffer.framebuffer_data = m_framebuffer->vaddr().as_ptr() + framebuffer_offset; @@ -89,32 +89,32 @@ void FrameBufferDevice::create_buffer(Buffer& buffer, size_t framebuffer_offset, info.enabled = 1; } -Protocol::DisplayInfoResponse::Display const& FrameBufferDevice::display_info() const +Protocol::DisplayInfoResponse::Display const& FramebufferDevice::display_info() const { return m_gpu.display_info(m_scanout); } -Protocol::DisplayInfoResponse::Display& FrameBufferDevice::display_info() +Protocol::DisplayInfoResponse::Display& FramebufferDevice::display_info() { return m_gpu.display_info(m_scanout); } -void FrameBufferDevice::transfer_framebuffer_data_to_host(Protocol::Rect const& rect, Buffer& buffer) +void FramebufferDevice::transfer_framebuffer_data_to_host(Protocol::Rect const& rect, Buffer& buffer) { m_gpu.transfer_framebuffer_data_to_host(m_scanout, rect, buffer.resource_id); } -void FrameBufferDevice::flush_dirty_window(Protocol::Rect const& dirty_rect, Buffer& buffer) +void FramebufferDevice::flush_dirty_window(Protocol::Rect const& dirty_rect, Buffer& buffer) { m_gpu.flush_dirty_rectangle(m_scanout, dirty_rect, buffer.resource_id); } -void FrameBufferDevice::flush_displayed_image(Protocol::Rect const& dirty_rect, Buffer& buffer) +void FramebufferDevice::flush_displayed_image(Protocol::Rect const& dirty_rect, Buffer& buffer) { m_gpu.flush_displayed_image(dirty_rect, buffer.resource_id); } -KResult FrameBufferDevice::try_to_set_resolution(size_t width, size_t height) +KResult FramebufferDevice::try_to_set_resolution(size_t width, size_t height) { if (width > MAX_VIRTIOGPU_RESOLUTION_WIDTH || height > MAX_VIRTIOGPU_RESOLUTION_HEIGHT) return EINVAL; @@ -133,7 +133,7 @@ KResult FrameBufferDevice::try_to_set_resolution(size_t width, size_t height) return create_framebuffer(); } -void FrameBufferDevice::set_buffer(int buffer_index) +void FramebufferDevice::set_buffer(int buffer_index) { auto& buffer = buffer_index == 0 ? m_main_buffer : m_back_buffer; MutexLocker locker(m_gpu.operation_lock()); @@ -145,7 +145,7 @@ void FrameBufferDevice::set_buffer(int buffer_index) buffer.dirty_rect = {}; } -KResult FrameBufferDevice::ioctl(OpenFileDescription&, unsigned request, Userspace arg) +KResult FramebufferDevice::ioctl(OpenFileDescription&, unsigned request, Userspace arg) { REQUIRE_PROMISE(video); switch (request) { @@ -233,7 +233,7 @@ KResult FrameBufferDevice::ioctl(OpenFileDescription&, unsigned request, Userspa }; } -KResultOr FrameBufferDevice::mmap(Process& process, OpenFileDescription&, Memory::VirtualRange const& range, u64 offset, int prot, bool shared) +KResultOr FramebufferDevice::mmap(Process& process, OpenFileDescription&, Memory::VirtualRange const& range, u64 offset, int prot, bool shared) { REQUIRE_PROMISE(video); if (!shared) @@ -267,7 +267,7 @@ KResultOr FrameBufferDevice::mmap(Process& process, OpenFileDes return m_userspace_mmap_region.unsafe_ptr(); } -void FrameBufferDevice::deactivate_writes() +void FramebufferDevice::deactivate_writes() { m_are_writes_active = false; if (m_userspace_mmap_region) { @@ -282,7 +282,7 @@ void FrameBufferDevice::deactivate_writes() clear_to_black(buffer_from_index(0)); } -void FrameBufferDevice::activate_writes() +void FramebufferDevice::activate_writes() { m_are_writes_active = true; auto last_set_buffer_index = m_last_set_buffer_index.load(); @@ -294,7 +294,7 @@ void FrameBufferDevice::activate_writes() set_buffer(last_set_buffer_index); } -void FrameBufferDevice::clear_to_black(Buffer& buffer) +void FramebufferDevice::clear_to_black(Buffer& buffer) { auto& info = display_info(); size_t width = info.rect.width; @@ -308,7 +308,7 @@ void FrameBufferDevice::clear_to_black(Buffer& buffer) } } -void FrameBufferDevice::draw_ntsc_test_pattern(Buffer& buffer) +void FramebufferDevice::draw_ntsc_test_pattern(Buffer& buffer) { static constexpr u8 colors[12][4] = { { 0xff, 0xff, 0xff, 0xff }, // White @@ -365,7 +365,7 @@ void FrameBufferDevice::draw_ntsc_test_pattern(Buffer& buffer) dbgln_if(VIRTIO_DEBUG, "Finish drawing the pattern"); } -u8* FrameBufferDevice::framebuffer_data() +u8* FramebufferDevice::framebuffer_data() { return m_current_buffer->framebuffer_data; } diff --git a/Kernel/Graphics/VirtIOGPU/FrameBufferDevice.h b/Kernel/Graphics/VirtIOGPU/FramebufferDevice.h similarity index 95% rename from Kernel/Graphics/VirtIOGPU/FrameBufferDevice.h rename to Kernel/Graphics/VirtIOGPU/FramebufferDevice.h index cb20c8d90c..e33f927d52 100644 --- a/Kernel/Graphics/VirtIOGPU/FrameBufferDevice.h +++ b/Kernel/Graphics/VirtIOGPU/FramebufferDevice.h @@ -13,7 +13,7 @@ namespace Kernel::Graphics::VirtIOGPU { -class FrameBufferDevice final : public BlockDevice { +class FramebufferDevice final : public BlockDevice { friend class Console; struct Buffer { size_t framebuffer_offset { 0 }; @@ -23,8 +23,8 @@ class FrameBufferDevice final : public BlockDevice { }; public: - FrameBufferDevice(VirtIOGPU::GPU& virtio_gpu, ScanoutID); - virtual ~FrameBufferDevice() override; + FramebufferDevice(VirtIOGPU::GPU& virtio_gpu, ScanoutID); + virtual ~FramebufferDevice() override; virtual void deactivate_writes(); virtual void activate_writes(); diff --git a/Kernel/Graphics/VirtIOGPU/GPU.cpp b/Kernel/Graphics/VirtIOGPU/GPU.cpp index 494c002d21..3483bfac3d 100644 --- a/Kernel/Graphics/VirtIOGPU/GPU.cpp +++ b/Kernel/Graphics/VirtIOGPU/GPU.cpp @@ -6,7 +6,7 @@ #include #include -#include +#include #include #define DEVICE_EVENTS_READ 0x0 @@ -63,7 +63,7 @@ void GPU::create_framebuffer_devices() { for (size_t i = 0; i < min(m_num_scanouts, VIRTIO_GPU_MAX_SCANOUTS); i++) { auto& scanout = m_scanouts[i]; - scanout.framebuffer = adopt_ref(*new VirtIOGPU::FrameBufferDevice(*this, i)); + scanout.framebuffer = adopt_ref(*new VirtIOGPU::FramebufferDevice(*this, i)); scanout.framebuffer->after_inserting(); scanout.console = Kernel::Graphics::VirtIOGPU::Console::initialize(scanout.framebuffer); } diff --git a/Kernel/Graphics/VirtIOGPU/GPU.h b/Kernel/Graphics/VirtIOGPU/GPU.h index 94d5da7ae8..e1bf527bca 100644 --- a/Kernel/Graphics/VirtIOGPU/GPU.h +++ b/Kernel/Graphics/VirtIOGPU/GPU.h @@ -29,7 +29,7 @@ namespace Kernel::Graphics::VirtIOGPU { class Console; -class FrameBufferDevice; +class FramebufferDevice; TYPEDEF_DISTINCT_ORDERED_ID(u32, ResourceID); TYPEDEF_DISTINCT_ORDERED_ID(u32, ScanoutID); @@ -37,7 +37,7 @@ TYPEDEF_DISTINCT_ORDERED_ID(u32, ScanoutID); class GPU final : public VirtIO::Device , public RefCounted { - friend class FrameBufferDevice; + friend class FramebufferDevice; public: GPU(PCI::DeviceIdentifier const&); @@ -82,7 +82,7 @@ private: virtual StringView class_name() const override { return "VirtIOGPU"sv; } struct Scanout { - RefPtr framebuffer; + RefPtr framebuffer; RefPtr console; Protocol::DisplayInfoResponse::Display display_info {}; }; diff --git a/Kernel/Graphics/VirtIOGPU/GraphicsAdapter.h b/Kernel/Graphics/VirtIOGPU/GraphicsAdapter.h index 95dae4632f..8ebaf78e72 100644 --- a/Kernel/Graphics/VirtIOGPU/GraphicsAdapter.h +++ b/Kernel/Graphics/VirtIOGPU/GraphicsAdapter.h @@ -7,7 +7,7 @@ #pragma once #include -#include +#include #include namespace Kernel::Graphics::VirtIOGPU {