summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Kernel/Graphics/BochsGraphicsAdapter.cpp3
-rw-r--r--Kernel/Graphics/GraphicsDevice.h7
-rw-r--r--Kernel/Graphics/GraphicsManagement.cpp155
-rw-r--r--Kernel/Graphics/GraphicsManagement.h1
-rw-r--r--Kernel/Graphics/VGACompatibleAdapter.cpp6
-rw-r--r--Kernel/Graphics/VirtIOGPU/VirtIOGraphicsAdapter.cpp2
-rw-r--r--Kernel/Graphics/VirtIOGPU/VirtIOGraphicsAdapter.h4
7 files changed, 94 insertions, 84 deletions
diff --git a/Kernel/Graphics/BochsGraphicsAdapter.cpp b/Kernel/Graphics/BochsGraphicsAdapter.cpp
index c957e58dae..ea8d1b23ce 100644
--- a/Kernel/Graphics/BochsGraphicsAdapter.cpp
+++ b/Kernel/Graphics/BochsGraphicsAdapter.cpp
@@ -50,8 +50,7 @@ UNMAP_AFTER_INIT NonnullRefPtr<BochsGraphicsAdapter> BochsGraphicsAdapter::initi
}
UNMAP_AFTER_INIT BochsGraphicsAdapter::BochsGraphicsAdapter(PCI::Address pci_address)
- : GraphicsDevice(pci_address)
- , PCI::DeviceController(pci_address)
+ : PCI::DeviceController(pci_address)
, m_mmio_registers(PCI::get_BAR2(pci_address) & 0xfffffff0)
{
// We assume safe resolutio is 1024x768x32
diff --git a/Kernel/Graphics/GraphicsDevice.h b/Kernel/Graphics/GraphicsDevice.h
index f730f32667..6928985c43 100644
--- a/Kernel/Graphics/GraphicsDevice.h
+++ b/Kernel/Graphics/GraphicsDevice.h
@@ -24,7 +24,6 @@ public:
virtual ~GraphicsDevice() = default;
virtual void initialize_framebuffer_devices() = 0;
virtual Type type() const = 0;
- PCI::Address device_pci_address() const { return m_pci_address; }
virtual void enable_consoles() = 0;
virtual void disable_consoles() = 0;
bool consoles_enabled() const { return m_consoles_enabled; }
@@ -37,12 +36,8 @@ public:
virtual bool set_y_offset(size_t output_port_index, size_t y) = 0;
protected:
- GraphicsDevice(PCI::Address pci_address)
- : m_pci_address(pci_address)
- {
- }
+ GraphicsDevice() = default;
- const PCI::Address m_pci_address;
bool m_consoles_enabled { false };
};
diff --git a/Kernel/Graphics/GraphicsManagement.cpp b/Kernel/Graphics/GraphicsManagement.cpp
index 567b2ea2f1..a3a11b4ab1 100644
--- a/Kernel/Graphics/GraphicsManagement.cpp
+++ b/Kernel/Graphics/GraphicsManagement.cpp
@@ -56,7 +56,88 @@ void GraphicsManagement::activate_graphical_mode()
static inline bool is_vga_compatible_pci_device(PCI::Address address)
{
- return PCI::get_class(address) == 0x3 && PCI::get_subclass(address) == 0x0;
+ // Note: Check for Display Controller, VGA Compatible Controller or
+ // Unclassified, VGA-Compatible Unclassified Device
+ auto is_display_controller_vga_compatible = PCI::get_class(address) == 0x3 && PCI::get_subclass(address) == 0x0;
+ auto is_general_pci_vga_compatible = PCI::get_class(address) == 0x0 && PCI::get_subclass(address) == 0x1;
+ return is_display_controller_vga_compatible || is_general_pci_vga_compatible;
+}
+
+static inline bool is_display_controller_pci_device(PCI::Address address)
+{
+ return PCI::get_class(address) == 0x3;
+}
+
+UNMAP_AFTER_INIT bool GraphicsManagement::determine_and_initialize_graphics_device(const PCI::Address& address, PCI::ID id)
+{
+ VERIFY(is_vga_compatible_pci_device(address) || is_display_controller_pci_device(address));
+ auto add_and_configure_adapter = [&](GraphicsDevice& graphics_device) {
+ m_graphics_devices.append(graphics_device);
+ if (!m_framebuffer_devices_allowed) {
+ graphics_device.enable_consoles();
+ return;
+ }
+ graphics_device.initialize_framebuffer_devices();
+ };
+
+ RefPtr<GraphicsDevice> adapter;
+ switch (id.vendor_id) {
+ case 0x1234:
+ if (id.device_id == 0x1111)
+ adapter = BochsGraphicsAdapter::initialize(address);
+ break;
+ case 0x80ee:
+ if (id.device_id == 0xbeef)
+ adapter = BochsGraphicsAdapter::initialize(address);
+ break;
+ case 0x8086:
+ adapter = IntelNativeGraphicsAdapter::initialize(address);
+ break;
+ case static_cast<u16>(PCIVendorID::VirtIO):
+ dmesgln("Graphics: Using VirtIO console");
+ adapter = Graphics::VirtIOGraphicsAdapter::initialize(address);
+ break;
+ default:
+ if (!is_vga_compatible_pci_device(address))
+ break;
+ // Note: Although technically possible that a system has a
+ // non-compatible VGA graphics device that was initialized by the
+ // Multiboot bootloader to provide a framebuffer, in practice we
+ // probably want to support these devices natively instead of
+ // initializing them as some sort of a generic GraphicsDevice. For now,
+ // the only known example of this sort of device is qxl in QEMU. For VGA
+ // compatible devices we don't have a special driver for (e.g. ati-vga,
+ // qxl-vga, cirrus-vga, vmware-svga in QEMU), it's much more likely that
+ // these devices will be supported by the Multiboot loader that will
+ // utilize VESA BIOS extensions (that we don't currently) of these cards
+ // support, so we want to utilize the provided framebuffer of these
+ // devices, if possible.
+ if (!m_vga_adapter && PCI::is_io_space_enabled(address)) {
+ if (multiboot_info_ptr->framebuffer_type == MULTIBOOT_FRAMEBUFFER_TYPE_RGB) {
+ dmesgln("Graphics: Using a preset resolution from the bootloader");
+ adapter = VGACompatibleAdapter::initialize_with_preset_resolution(address,
+ PhysicalAddress((u32)(multiboot_info_ptr->framebuffer_addr)),
+ multiboot_info_ptr->framebuffer_width,
+ multiboot_info_ptr->framebuffer_height,
+ multiboot_info_ptr->framebuffer_pitch);
+ }
+ } else {
+ dmesgln("Graphics: Using a VGA compatible generic adapter");
+ adapter = VGACompatibleAdapter::initialize(address);
+ }
+ break;
+ }
+ if (!adapter)
+ return false;
+ add_and_configure_adapter(*adapter);
+
+ // Note: If IO space is enabled, this VGA adapter is operating in VGA mode.
+ // Note: If no other VGA adapter is attached as m_vga_adapter, we should attach it then.
+ if (!m_vga_adapter && PCI::is_io_space_enabled(address) && adapter->type() == GraphicsDevice::Type::VGACompatible) {
+ dbgln("Graphics adapter @ {} is operating in VGA mode", address);
+ m_vga_adapter = adapter;
+ }
+ return true;
}
UNMAP_AFTER_INIT bool GraphicsManagement::initialize()
@@ -102,81 +183,15 @@ UNMAP_AFTER_INIT bool GraphicsManagement::initialize()
dbgln("Forcing no initialization of framebuffer devices");
}
- auto add_and_initialize_adapter = [&](NonnullRefPtr<GraphicsDevice> display_adapter) {
- m_graphics_devices.append(display_adapter);
- if (!m_framebuffer_devices_allowed) {
- display_adapter->enable_consoles();
- return;
- }
- display_adapter->initialize_framebuffer_devices();
- };
- auto have_adapter_for_address = [&](const PCI::Address& address) {
- for (auto& adapter : m_graphics_devices) {
- if (adapter.device_pci_address() == address)
- return true;
- }
- return false;
- };
-
- Vector<PCI::Address, 8> uninitialized_vga_pci_addresses;
PCI::enumerate([&](const PCI::Address& address, PCI::ID id) {
// Note: Each graphics controller will try to set its native screen resolution
// upon creation. Later on, if we don't want to have framebuffer devices, a
// framebuffer console will take the control instead.
- RefPtr<GraphicsDevice> adapter;
- bool is_vga_compatible = is_vga_compatible_pci_device(address);
- if ((id.vendor_id == 0x1234 && id.device_id == 0x1111) || (id.vendor_id == 0x80ee && id.device_id == 0xbeef)) {
- adapter = BochsGraphicsAdapter::initialize(address);
- } else if (is_vga_compatible) {
- if (id.vendor_id == 0x8086) {
- adapter = IntelNativeGraphicsAdapter::initialize(address);
- } else if (id.vendor_id == static_cast<u16>(PCIVendorID::VirtIO)) {
- dmesgln("Graphics: Using VirtIO console");
- adapter = Graphics::VirtIOGraphicsAdapter::initialize(address);
- }
- }
- if (adapter)
- add_and_initialize_adapter(adapter.release_nonnull());
- else if (is_vga_compatible)
- uninitialized_vga_pci_addresses.append(address);
+ if (!is_vga_compatible_pci_device(address) || !is_display_controller_pci_device(address))
+ return;
+ determine_and_initialize_graphics_device(address, id);
});
- if (!uninitialized_vga_pci_addresses.is_empty()) {
- for (auto& address : uninitialized_vga_pci_addresses) {
- VERIFY(is_vga_compatible_pci_device(address));
- VERIFY(!have_adapter_for_address(address));
-
- if (multiboot_info_ptr->framebuffer_type == MULTIBOOT_FRAMEBUFFER_TYPE_RGB) {
- dmesgln("Graphics: Using a preset resolution from the bootloader");
- auto vga_adapter = VGACompatibleAdapter::initialize_with_preset_resolution(address,
- PhysicalAddress((u32)(multiboot_info_ptr->framebuffer_addr)),
- multiboot_info_ptr->framebuffer_width,
- multiboot_info_ptr->framebuffer_height,
- multiboot_info_ptr->framebuffer_pitch);
- m_vga_adapter = vga_adapter;
- add_and_initialize_adapter(move(vga_adapter));
- } else {
- dmesgln("Graphics: Using a VGA compatible generic adapter");
- auto vga_adapter = VGACompatibleAdapter::initialize(address);
- m_vga_adapter = vga_adapter;
- add_and_initialize_adapter(move(vga_adapter));
- }
- break; // We can only have one vga adapter
- }
-
- // If we still don't have a VGA compatible adapter, check if any of the ones
- // we support explicitly happens to be able to operate in VGA mode
- if (!m_vga_adapter) {
- for (auto& adapter : m_graphics_devices) {
- // If IO space is enabled, this VGA adapter is operating in VGA mode.
- if (adapter.type() == GraphicsDevice::Type::VGACompatible && !m_vga_adapter && PCI::is_io_space_enabled(adapter.device_pci_address())) {
- dbgln("Graphics adapter @ {} is operating in VGA mode", adapter.device_pci_address());
- m_vga_adapter = adapter;
- break;
- }
- }
- }
- }
if (m_graphics_devices.is_empty()) {
dbgln("No graphics adapter was initialized.");
return false;
diff --git a/Kernel/Graphics/GraphicsManagement.h b/Kernel/Graphics/GraphicsManagement.h
index 7ccb56dc09..bb99dcc2c8 100644
--- a/Kernel/Graphics/GraphicsManagement.h
+++ b/Kernel/Graphics/GraphicsManagement.h
@@ -47,6 +47,7 @@ public:
void activate_graphical_mode();
private:
+ bool determine_and_initialize_graphics_device(const PCI::Address& address, PCI::ID id);
NonnullRefPtrVector<GraphicsDevice> m_graphics_devices;
NonnullOwnPtr<Region> m_vga_font_region;
RefPtr<Graphics::Console> m_console;
diff --git a/Kernel/Graphics/VGACompatibleAdapter.cpp b/Kernel/Graphics/VGACompatibleAdapter.cpp
index dbe5a85ebc..1f30fc10fc 100644
--- a/Kernel/Graphics/VGACompatibleAdapter.cpp
+++ b/Kernel/Graphics/VGACompatibleAdapter.cpp
@@ -37,8 +37,7 @@ UNMAP_AFTER_INIT void VGACompatibleAdapter::initialize_framebuffer_devices()
}
UNMAP_AFTER_INIT VGACompatibleAdapter::VGACompatibleAdapter(PCI::Address address)
- : GraphicsDevice(address)
- , PCI::DeviceController(address)
+ : PCI::DeviceController(address)
{
m_framebuffer_console = Graphics::TextModeConsole::initialize(*this);
// FIXME: This is a very wrong way to do this...
@@ -46,8 +45,7 @@ UNMAP_AFTER_INIT VGACompatibleAdapter::VGACompatibleAdapter(PCI::Address address
}
UNMAP_AFTER_INIT VGACompatibleAdapter::VGACompatibleAdapter(PCI::Address address, PhysicalAddress framebuffer_address, size_t framebuffer_width, size_t framebuffer_height, size_t framebuffer_pitch)
- : GraphicsDevice(address)
- , PCI::DeviceController(address)
+ : PCI::DeviceController(address)
, m_framebuffer_address(framebuffer_address)
, m_framebuffer_width(framebuffer_width)
, m_framebuffer_height(framebuffer_height)
diff --git a/Kernel/Graphics/VirtIOGPU/VirtIOGraphicsAdapter.cpp b/Kernel/Graphics/VirtIOGPU/VirtIOGraphicsAdapter.cpp
index 24b4b39024..a7740480af 100644
--- a/Kernel/Graphics/VirtIOGPU/VirtIOGraphicsAdapter.cpp
+++ b/Kernel/Graphics/VirtIOGPU/VirtIOGraphicsAdapter.cpp
@@ -17,7 +17,7 @@ NonnullRefPtr<VirtIOGraphicsAdapter> VirtIOGraphicsAdapter::initialize(PCI::Addr
}
VirtIOGraphicsAdapter::VirtIOGraphicsAdapter(PCI::Address base_address)
- : GraphicsDevice(base_address)
+ : PCI::DeviceController(base_address)
{
m_gpu_device = adopt_ref(*new VirtIOGPU(base_address)).leak_ref();
}
diff --git a/Kernel/Graphics/VirtIOGPU/VirtIOGraphicsAdapter.h b/Kernel/Graphics/VirtIOGPU/VirtIOGraphicsAdapter.h
index 9a575b242a..132e07e44e 100644
--- a/Kernel/Graphics/VirtIOGPU/VirtIOGraphicsAdapter.h
+++ b/Kernel/Graphics/VirtIOGPU/VirtIOGraphicsAdapter.h
@@ -12,7 +12,9 @@
namespace Kernel::Graphics {
-class VirtIOGraphicsAdapter final : public GraphicsDevice {
+class VirtIOGraphicsAdapter final
+ : public GraphicsDevice
+ , public PCI::DeviceController {
AK_MAKE_ETERNAL
public:
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-17 09:46:58 +0000