From 69a360223701a7c0df2b49581726e01f7e163d7b Mon Sep 17 00:00:00 2001
From: "Liav A." <liavalb@gmail.com>
Date: Sat, 24 Feb 2024 18:05:15 +0200
Subject: [PATCH] Kernel/GPU: Rename GenericGraphicsAdapter => GPUDevice

GenericGraphicsAdapter is mouthful. Also, the idea is to move towards a
more advanced subsystem that handles GPUs, not merely graphics adapters.
---
 Kernel/Devices/GPU/3dfx/GraphicsAdapter.cpp            |  2 +-
 Kernel/Devices/GPU/3dfx/GraphicsAdapter.h              |  6 +++---
 Kernel/Devices/GPU/Bochs/GraphicsAdapter.cpp           |  2 +-
 Kernel/Devices/GPU/Bochs/GraphicsAdapter.h             |  6 +++---
 Kernel/Devices/GPU/Console/Console.h                   |  2 +-
 .../GPU/{GenericGraphicsAdapter.h => GPUDevice.h}      | 10 +++++-----
 Kernel/Devices/GPU/Intel/NativeGraphicsAdapter.cpp     |  4 ++--
 Kernel/Devices/GPU/Intel/NativeGraphicsAdapter.h       |  4 ++--
 Kernel/Devices/GPU/Management.cpp                      |  2 +-
 Kernel/Devices/GPU/Management.h                        |  4 ++--
 Kernel/Devices/GPU/VMWare/GraphicsAdapter.cpp          |  2 +-
 Kernel/Devices/GPU/VMWare/GraphicsAdapter.h            |  6 +++---
 Kernel/Devices/GPU/VirtIO/GraphicsAdapter.cpp          |  2 +-
 Kernel/Devices/GPU/VirtIO/GraphicsAdapter.h            |  6 +++---
 14 files changed, 29 insertions(+), 29 deletions(-)
 rename Kernel/Devices/GPU/{GenericGraphicsAdapter.h => GPUDevice.h} (61%)

diff --git a/Kernel/Devices/GPU/3dfx/GraphicsAdapter.cpp b/Kernel/Devices/GPU/3dfx/GraphicsAdapter.cpp
index 4a5f665ac4108c..9d5d3ca9d440ee 100644
--- a/Kernel/Devices/GPU/3dfx/GraphicsAdapter.cpp
+++ b/Kernel/Devices/GPU/3dfx/GraphicsAdapter.cpp
@@ -34,7 +34,7 @@ UNMAP_AFTER_INIT ErrorOr<bool> VoodooGraphicsAdapter::probe(PCI::DeviceIdentifie
     return id.vendor_id == PCI::VendorID::Tdfx && is_supported_model(id.device_id);
 }
 
-UNMAP_AFTER_INIT ErrorOr<NonnullLockRefPtr<GenericGraphicsAdapter>> VoodooGraphicsAdapter::create(PCI::DeviceIdentifier const& pci_device_identifier)
+UNMAP_AFTER_INIT ErrorOr<NonnullLockRefPtr<GPUDevice>> VoodooGraphicsAdapter::create(PCI::DeviceIdentifier const& pci_device_identifier)
 {
     auto adapter = TRY(adopt_nonnull_lock_ref_or_enomem(new (nothrow) VoodooGraphicsAdapter(pci_device_identifier)));
     MUST(adapter->initialize_adapter(pci_device_identifier));
diff --git a/Kernel/Devices/GPU/3dfx/GraphicsAdapter.h b/Kernel/Devices/GPU/3dfx/GraphicsAdapter.h
index af70abfb89d636..d6d319574eb6ae 100644
--- a/Kernel/Devices/GPU/3dfx/GraphicsAdapter.h
+++ b/Kernel/Devices/GPU/3dfx/GraphicsAdapter.h
@@ -9,16 +9,16 @@
 #include <AK/Types.h>
 #include <Kernel/Bus/PCI/Device.h>
 #include <Kernel/Devices/GPU/Console/GenericFramebufferConsole.h>
-#include <Kernel/Devices/GPU/GenericGraphicsAdapter.h>
+#include <Kernel/Devices/GPU/GPUDevice.h>
 
 namespace Kernel {
 
-class VoodooGraphicsAdapter final : public GenericGraphicsAdapter
+class VoodooGraphicsAdapter final : public GPUDevice
     , public PCI::Device {
 
 public:
     static ErrorOr<bool> probe(PCI::DeviceIdentifier const&);
-    static ErrorOr<NonnullLockRefPtr<GenericGraphicsAdapter>> create(PCI::DeviceIdentifier const&);
+    static ErrorOr<NonnullLockRefPtr<GPUDevice>> create(PCI::DeviceIdentifier const&);
     virtual ~VoodooGraphicsAdapter() = default;
     virtual StringView device_name() const override { return "VoodooGraphicsAdapter"sv; }
 
diff --git a/Kernel/Devices/GPU/Bochs/GraphicsAdapter.cpp b/Kernel/Devices/GPU/Bochs/GraphicsAdapter.cpp
index addde186c36510..ab3fb118a3a97f 100644
--- a/Kernel/Devices/GPU/Bochs/GraphicsAdapter.cpp
+++ b/Kernel/Devices/GPU/Bochs/GraphicsAdapter.cpp
@@ -33,7 +33,7 @@ UNMAP_AFTER_INIT ErrorOr<bool> BochsGraphicsAdapter::probe(PCI::DeviceIdentifier
     return false;
 }
 
-UNMAP_AFTER_INIT ErrorOr<NonnullLockRefPtr<GenericGraphicsAdapter>> BochsGraphicsAdapter::create(PCI::DeviceIdentifier const& pci_device_identifier)
+UNMAP_AFTER_INIT ErrorOr<NonnullLockRefPtr<GPUDevice>> BochsGraphicsAdapter::create(PCI::DeviceIdentifier const& pci_device_identifier)
 {
     auto adapter = TRY(adopt_nonnull_lock_ref_or_enomem(new (nothrow) BochsGraphicsAdapter(pci_device_identifier)));
     MUST(adapter->initialize_adapter(pci_device_identifier));
diff --git a/Kernel/Devices/GPU/Bochs/GraphicsAdapter.h b/Kernel/Devices/GPU/Bochs/GraphicsAdapter.h
index 728308c693d63c..4929bb0489eb2d 100644
--- a/Kernel/Devices/GPU/Bochs/GraphicsAdapter.h
+++ b/Kernel/Devices/GPU/Bochs/GraphicsAdapter.h
@@ -10,7 +10,7 @@
 #include <Kernel/Bus/PCI/Device.h>
 #include <Kernel/Devices/GPU/Bochs/Definitions.h>
 #include <Kernel/Devices/GPU/Console/GenericFramebufferConsole.h>
-#include <Kernel/Devices/GPU/GenericGraphicsAdapter.h>
+#include <Kernel/Devices/GPU/GPUDevice.h>
 #include <Kernel/Memory/PhysicalAddress.h>
 #include <Kernel/Memory/TypedMapping.h>
 
@@ -19,13 +19,13 @@ namespace Kernel {
 class GraphicsManagement;
 struct BochsDisplayMMIORegisters;
 
-class BochsGraphicsAdapter final : public GenericGraphicsAdapter
+class BochsGraphicsAdapter final : public GPUDevice
     , public PCI::Device {
     friend class GraphicsManagement;
 
 public:
     static ErrorOr<bool> probe(PCI::DeviceIdentifier const&);
-    static ErrorOr<NonnullLockRefPtr<GenericGraphicsAdapter>> create(PCI::DeviceIdentifier const&);
+    static ErrorOr<NonnullLockRefPtr<GPUDevice>> create(PCI::DeviceIdentifier const&);
     virtual ~BochsGraphicsAdapter() = default;
     virtual StringView device_name() const override { return "BochsGraphicsAdapter"sv; }
 
diff --git a/Kernel/Devices/GPU/Console/Console.h b/Kernel/Devices/GPU/Console/Console.h
index 9b036d32e5fcd1..5d4dee47606250 100644
--- a/Kernel/Devices/GPU/Console/Console.h
+++ b/Kernel/Devices/GPU/Console/Console.h
@@ -8,7 +8,7 @@
 
 #include <AK/AtomicRefCounted.h>
 #include <AK/Types.h>
-#include <Kernel/Devices/GPU/GenericGraphicsAdapter.h>
+#include <Kernel/Devices/GPU/GPUDevice.h>
 
 namespace Kernel::Graphics {
 
diff --git a/Kernel/Devices/GPU/GenericGraphicsAdapter.h b/Kernel/Devices/GPU/GPUDevice.h
similarity index 61%
rename from Kernel/Devices/GPU/GenericGraphicsAdapter.h
rename to Kernel/Devices/GPU/GPUDevice.h
index 802b7cac80b6d4..32e12c3ae35908 100644
--- a/Kernel/Devices/GPU/GenericGraphicsAdapter.h
+++ b/Kernel/Devices/GPU/GPUDevice.h
@@ -13,14 +13,14 @@
 #include <Kernel/Memory/PhysicalAddress.h>
 
 namespace Kernel {
-class GenericGraphicsAdapter
-    : public AtomicRefCounted<GenericGraphicsAdapter>
-    , public LockWeakable<GenericGraphicsAdapter> {
+class GPUDevice
+    : public AtomicRefCounted<GPUDevice>
+    , public LockWeakable<GPUDevice> {
 public:
-    virtual ~GenericGraphicsAdapter() = default;
+    virtual ~GPUDevice() = default;
 
 protected:
-    GenericGraphicsAdapter() = default;
+    GPUDevice() = default;
 };
 
 }
diff --git a/Kernel/Devices/GPU/Intel/NativeGraphicsAdapter.cpp b/Kernel/Devices/GPU/Intel/NativeGraphicsAdapter.cpp
index cc61f2294a4e39..e11e96e78d3457 100644
--- a/Kernel/Devices/GPU/Intel/NativeGraphicsAdapter.cpp
+++ b/Kernel/Devices/GPU/Intel/NativeGraphicsAdapter.cpp
@@ -32,7 +32,7 @@ ErrorOr<bool> IntelNativeGraphicsAdapter::probe(PCI::DeviceIdentifier const& pci
     return is_supported_model(pci_device_identifier.hardware_id().device_id);
 }
 
-ErrorOr<NonnullLockRefPtr<GenericGraphicsAdapter>> IntelNativeGraphicsAdapter::create(PCI::DeviceIdentifier const& pci_device_identifier)
+ErrorOr<NonnullLockRefPtr<GPUDevice>> IntelNativeGraphicsAdapter::create(PCI::DeviceIdentifier const& pci_device_identifier)
 {
     auto adapter = TRY(adopt_nonnull_lock_ref_or_enomem(new (nothrow) IntelNativeGraphicsAdapter(pci_device_identifier)));
     TRY(adapter->initialize_adapter());
@@ -67,7 +67,7 @@ ErrorOr<void> IntelNativeGraphicsAdapter::initialize_adapter()
 }
 
 IntelNativeGraphicsAdapter::IntelNativeGraphicsAdapter(PCI::DeviceIdentifier const& pci_device_identifier)
-    : GenericGraphicsAdapter()
+    : GPUDevice()
     , PCI::Device(const_cast<PCI::DeviceIdentifier&>(pci_device_identifier))
 {
 }
diff --git a/Kernel/Devices/GPU/Intel/NativeGraphicsAdapter.h b/Kernel/Devices/GPU/Intel/NativeGraphicsAdapter.h
index 69875d958b4b89..8d849e859a5b40 100644
--- a/Kernel/Devices/GPU/Intel/NativeGraphicsAdapter.h
+++ b/Kernel/Devices/GPU/Intel/NativeGraphicsAdapter.h
@@ -17,12 +17,12 @@
 namespace Kernel {
 
 class IntelNativeGraphicsAdapter final
-    : public GenericGraphicsAdapter
+    : public GPUDevice
     , public PCI::Device {
 
 public:
     static ErrorOr<bool> probe(PCI::DeviceIdentifier const&);
-    static ErrorOr<NonnullLockRefPtr<GenericGraphicsAdapter>> create(PCI::DeviceIdentifier const&);
+    static ErrorOr<NonnullLockRefPtr<GPUDevice>> create(PCI::DeviceIdentifier const&);
 
     virtual ~IntelNativeGraphicsAdapter() = default;
 
diff --git a/Kernel/Devices/GPU/Management.cpp b/Kernel/Devices/GPU/Management.cpp
index 74f6956500704c..7e58121b296f79 100644
--- a/Kernel/Devices/GPU/Management.cpp
+++ b/Kernel/Devices/GPU/Management.cpp
@@ -123,7 +123,7 @@ static inline bool is_display_controller_pci_device(PCI::DeviceIdentifier const&
 
 struct PCIGraphicsDriverInitializer {
     ErrorOr<bool> (*probe)(PCI::DeviceIdentifier const&) = nullptr;
-    ErrorOr<NonnullLockRefPtr<GenericGraphicsAdapter>> (*create)(PCI::DeviceIdentifier const&) = nullptr;
+    ErrorOr<NonnullLockRefPtr<GPUDevice>> (*create)(PCI::DeviceIdentifier const&) = nullptr;
 };
 
 static constexpr PCIGraphicsDriverInitializer s_initializers[] = {
diff --git a/Kernel/Devices/GPU/Management.h b/Kernel/Devices/GPU/Management.h
index 7a832bdb827d59..cbbfd81572a85f 100644
--- a/Kernel/Devices/GPU/Management.h
+++ b/Kernel/Devices/GPU/Management.h
@@ -15,8 +15,8 @@
 #include <Kernel/Bus/PCI/Definitions.h>
 #include <Kernel/Devices/GPU/Console/Console.h>
 #include <Kernel/Devices/GPU/DisplayConnector.h>
+#include <Kernel/Devices/GPU/GPUDevice.h>
 #include <Kernel/Devices/GPU/Generic/DisplayConnector.h>
-#include <Kernel/Devices/GPU/GenericGraphicsAdapter.h>
 #include <Kernel/Devices/GPU/VirtIO/GraphicsAdapter.h>
 #include <Kernel/Library/NonnullLockRefPtr.h>
 #include <Kernel/Memory/Region.h>
@@ -53,7 +53,7 @@ class GraphicsManagement {
 
     void initialize_preset_resolution_generic_display_connector();
 
-    Vector<NonnullLockRefPtr<GenericGraphicsAdapter>> m_graphics_devices;
+    Vector<NonnullLockRefPtr<GPUDevice>> m_graphics_devices;
     LockRefPtr<Graphics::Console> m_console;
 
     // Note: This is only used when booting with kernel commandline that includes "graphics_subsystem_mode=limited"
diff --git a/Kernel/Devices/GPU/VMWare/GraphicsAdapter.cpp b/Kernel/Devices/GPU/VMWare/GraphicsAdapter.cpp
index 57b2c72b291a83..597f4259c0b092 100644
--- a/Kernel/Devices/GPU/VMWare/GraphicsAdapter.cpp
+++ b/Kernel/Devices/GPU/VMWare/GraphicsAdapter.cpp
@@ -28,7 +28,7 @@ ErrorOr<bool> VMWareGraphicsAdapter::probe(PCI::DeviceIdentifier const& pci_devi
     return id.vendor_id == PCI::VendorID::VMWare && id.device_id == 0x0405;
 }
 
-ErrorOr<NonnullLockRefPtr<GenericGraphicsAdapter>> VMWareGraphicsAdapter::create(PCI::DeviceIdentifier const& pci_device_identifier)
+ErrorOr<NonnullLockRefPtr<GPUDevice>> VMWareGraphicsAdapter::create(PCI::DeviceIdentifier const& pci_device_identifier)
 {
     auto registers_io_window = TRY(IOWindow::create_for_pci_device_bar(pci_device_identifier, PCI::HeaderType0BaseRegister::BAR0));
     auto adapter = TRY(adopt_nonnull_lock_ref_or_enomem(new (nothrow) VMWareGraphicsAdapter(pci_device_identifier, move(registers_io_window))));
diff --git a/Kernel/Devices/GPU/VMWare/GraphicsAdapter.h b/Kernel/Devices/GPU/VMWare/GraphicsAdapter.h
index 49a36785dc3972..6e0f9311c59e48 100644
--- a/Kernel/Devices/GPU/VMWare/GraphicsAdapter.h
+++ b/Kernel/Devices/GPU/VMWare/GraphicsAdapter.h
@@ -8,7 +8,7 @@
 
 #include <AK/Types.h>
 #include <Kernel/Bus/PCI/Device.h>
-#include <Kernel/Devices/GPU/GenericGraphicsAdapter.h>
+#include <Kernel/Devices/GPU/GPUDevice.h>
 #include <Kernel/Devices/GPU/VMWare/Definitions.h>
 #include <Kernel/Library/IOWindow.h>
 #include <Kernel/Locking/Spinlock.h>
@@ -21,13 +21,13 @@ class GraphicsManagement;
 
 class VMWareDisplayConnector;
 class VMWareGraphicsAdapter final
-    : public GenericGraphicsAdapter
+    : public GPUDevice
     , public PCI::Device {
     friend class GraphicsManagement;
 
 public:
     static ErrorOr<bool> probe(PCI::DeviceIdentifier const&);
-    static ErrorOr<NonnullLockRefPtr<GenericGraphicsAdapter>> create(PCI::DeviceIdentifier const&);
+    static ErrorOr<NonnullLockRefPtr<GPUDevice>> create(PCI::DeviceIdentifier const&);
     virtual ~VMWareGraphicsAdapter() = default;
 
     virtual StringView device_name() const override { return "VMWareGraphicsAdapter"sv; }
diff --git a/Kernel/Devices/GPU/VirtIO/GraphicsAdapter.cpp b/Kernel/Devices/GPU/VirtIO/GraphicsAdapter.cpp
index e2ec60d95982ea..ee03c0a02aa63e 100644
--- a/Kernel/Devices/GPU/VirtIO/GraphicsAdapter.cpp
+++ b/Kernel/Devices/GPU/VirtIO/GraphicsAdapter.cpp
@@ -28,7 +28,7 @@ ErrorOr<bool> VirtIOGraphicsAdapter::probe(PCI::DeviceIdentifier const& device_i
     return device_identifier.hardware_id().vendor_id == PCI::VendorID::VirtIO;
 }
 
-ErrorOr<NonnullLockRefPtr<GenericGraphicsAdapter>> VirtIOGraphicsAdapter::create(PCI::DeviceIdentifier const& device_identifier)
+ErrorOr<NonnullLockRefPtr<GPUDevice>> VirtIOGraphicsAdapter::create(PCI::DeviceIdentifier const& device_identifier)
 {
     // Setup memory transfer region
     auto scratch_space_region = TRY(MM.allocate_contiguous_kernel_region(
diff --git a/Kernel/Devices/GPU/VirtIO/GraphicsAdapter.h b/Kernel/Devices/GPU/VirtIO/GraphicsAdapter.h
index bfcee9c56bac46..1f89e07c97f092 100644
--- a/Kernel/Devices/GPU/VirtIO/GraphicsAdapter.h
+++ b/Kernel/Devices/GPU/VirtIO/GraphicsAdapter.h
@@ -10,7 +10,7 @@
 #include <AK/DistinctNumeric.h>
 #include <Kernel/Bus/VirtIO/Device.h>
 #include <Kernel/Bus/VirtIO/Queue.h>
-#include <Kernel/Devices/GPU/GenericGraphicsAdapter.h>
+#include <Kernel/Devices/GPU/GPUDevice.h>
 #include <Kernel/Devices/GPU/VirtIO/Protocol.h>
 
 namespace Kernel {
@@ -31,14 +31,14 @@ namespace Kernel {
 class VirtIODisplayConnector;
 class VirtIOGPU3DDevice;
 class VirtIOGraphicsAdapter final
-    : public GenericGraphicsAdapter
+    : public GPUDevice
     , public VirtIO::Device {
     friend class VirtIODisplayConnector;
     friend class VirtIOGPU3DDevice;
 
 public:
     static ErrorOr<bool> probe(PCI::DeviceIdentifier const&);
-    static ErrorOr<NonnullLockRefPtr<GenericGraphicsAdapter>> create(PCI::DeviceIdentifier const&);
+    static ErrorOr<NonnullLockRefPtr<GPUDevice>> create(PCI::DeviceIdentifier const&);
 
     virtual ErrorOr<void> initialize_virtio_resources() override;