RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-27 01:47:35 +00:00
Code Issues Activity Actions

Kernel/Graphics: Force VirtIO Framebuffer to inherit FramebufferDevice

Browse source 
The distinction is not justified because a VirtIO Framebuffer device
acts much more like a regular FramebufferDevice than a pure BlockDevice.
This commit is contained in:
Liav A 2021-09-21 09:26:14 +03:00 • committed by Idan Horowitz
parent 4815282a5f
commit fb0ed2ae46
7 changed files with 24 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

12
Kernel/Graphics/VirtIOGPU/FramebufferDevice.h
View file

@ -8,12 +8,13 @@
#include <Kernel/Bus/VirtIO/Device.h>
#include <Kernel/Bus/VirtIO/Queue.h>
#include <Kernel/Devices/BlockDevice.h>
#include <Kernel/Graphics/FramebufferDevice.h>
#include <Kernel/Graphics/GraphicsDevice.h>
#include <Kernel/Graphics/VirtIOGPU/GPU.h>
namespace Kernel::Graphics::VirtIOGPU {
class FramebufferDevice final : public BlockDevice {
class FramebufferDevice final : public Kernel::FramebufferDevice {
friend class Console;
struct Buffer {
size_t framebuffer_offset { 0 };
@ -23,7 +24,7 @@ class FramebufferDevice final : public BlockDevice {
};
public:
FramebufferDevice(VirtIOGPU::GPU& virtio_gpu, ScanoutID);
FramebufferDevice(GraphicsDevice const&, VirtIOGPU::GPU& virtio_gpu, ScanoutID);
virtual ~FramebufferDevice() override;
virtual void deactivate_writes();
@ -62,11 +63,6 @@ private:
virtual KResult ioctl(OpenFileDescription&, unsigned request, Userspace<void*> arg) override;
virtual KResultOr<Memory::Region*> mmap(Process&, OpenFileDescription&, Memory::VirtualRange const&, u64 offset, int prot, bool shared) override;
virtual bool can_read(const OpenFileDescription&, size_t) const override { return true; }
virtual KResultOr<size_t> read(OpenFileDescription&, u64, UserOrKernelBuffer&, size_t) override { return EINVAL; }
virtual bool can_write(const OpenFileDescription&, size_t) const override { return true; }
virtual KResultOr<size_t> write(OpenFileDescription&, u64, const UserOrKernelBuffer&, size_t) override { return EINVAL; };
virtual void start_request(AsyncBlockDeviceRequest& request) override { request.complete(AsyncDeviceRequest::Failure); }
static bool is_valid_buffer_index(int buffer_index)
{