Kernel: Move all Graphics-related code into Devices/GPU directory

Like the HID, Audio and Storage subsystem, the Graphics subsystem (which
handles GPUs technically) exposes unix device files (typically in /dev).
To ensure consistency across the repository, move all related files to a
new directory under Kernel/Devices called "GPU".

Also remove the redundant "GPU" word from the VirtIO driver directory,
and the word "Graphics" from GraphicsManagement.{h,cpp} filenames.

Kernel/Arch/aarch64/kprintf.cpp

@@ -6,7 +6,7 @@
 
 #include <AK/Types.h>
 #include <Kernel/Arch/aarch64/RPi/UART.h>
-#include <Kernel/Graphics/Console/BootFramebufferConsole.h>
+#include <Kernel/Devices/GPU/Console/BootFramebufferConsole.h>
 #include <Kernel/kstdio.h>
 
 // FIXME: Merge the code in this file with Kernel/kprintf.cpp once the proper abstractions are in place.

Kernel/Arch/init.cpp

@@ -16,6 +16,9 @@
 #include <Kernel/Bus/VirtIO/Device.h>
 #include <Kernel/Devices/Audio/Management.h>
 #include <Kernel/Devices/DeviceManagement.h>
+#include <Kernel/Devices/GPU/Console/BootFramebufferConsole.h>
+#include <Kernel/Devices/GPU/Console/VGATextModeConsole.h>
+#include <Kernel/Devices/GPU/Management.h>
 #include <Kernel/Devices/Generic/DeviceControlDevice.h>
 #include <Kernel/Devices/Generic/FullDevice.h>
 #include <Kernel/Devices/Generic/MemoryDevice.h>
@@ -33,9 +36,6 @@
 #include <Kernel/FileSystem/VirtualFileSystem.h>
 #include <Kernel/Firmware/ACPI/Initialize.h>
 #include <Kernel/Firmware/ACPI/Parser.h>
-#include <Kernel/Graphics/Console/BootFramebufferConsole.h>
-#include <Kernel/Graphics/Console/VGATextModeConsole.h>
-#include <Kernel/Graphics/GraphicsManagement.h>
 #include <Kernel/Heap/kmalloc.h>
 #include <Kernel/KSyms.h>
 #include <Kernel/Library/Panic.h>

Kernel/Arch/x86_64/Hypervisor/BochsDisplayConnector.cpp

@@ -10,9 +10,9 @@
 #include <Kernel/Bus/PCI/Access.h>
 #include <Kernel/Debug.h>
 #include <Kernel/Devices/DeviceManagement.h>
-#include <Kernel/Graphics/Bochs/Definitions.h>
+#include <Kernel/Devices/GPU/Bochs/Definitions.h>
-#include <Kernel/Graphics/Console/ContiguousFramebufferConsole.h>
+#include <Kernel/Devices/GPU/Console/ContiguousFramebufferConsole.h>
-#include <Kernel/Graphics/GraphicsManagement.h>
+#include <Kernel/Devices/GPU/Management.h>
 
 namespace Kernel {
 

Kernel/Arch/x86_64/Hypervisor/BochsDisplayConnector.h

@@ -7,9 +7,9 @@
 #pragma once
 
 #include <AK/Try.h>
-#include <Kernel/Graphics/Bochs/Definitions.h>
+#include <Kernel/Devices/GPU/Bochs/Definitions.h>
-#include <Kernel/Graphics/Console/GenericFramebufferConsole.h>
+#include <Kernel/Devices/GPU/Console/GenericFramebufferConsole.h>
-#include <Kernel/Graphics/DisplayConnector.h>
+#include <Kernel/Devices/GPU/DisplayConnector.h>
 #include <Kernel/Library/LockRefPtr.h>
 #include <Kernel/Locking/Spinlock.h>
 #include <Kernel/Memory/TypedMapping.h>

Kernel/CMakeLists.txt

@@ -68,6 +68,31 @@ set(KERNEL_SOURCES
     Devices/Generic/RandomDevice.cpp
     Devices/Generic/SelfTTYDevice.cpp
     Devices/Generic/ZeroDevice.cpp
+    Devices/GPU/Bochs/GraphicsAdapter.cpp
+    Devices/GPU/Bochs/QEMUDisplayConnector.cpp
+    Devices/GPU/Console/BootFramebufferConsole.cpp
+    Devices/GPU/Console/GenericFramebufferConsole.cpp
+    Devices/GPU/Console/ContiguousFramebufferConsole.cpp
+    Devices/GPU/Console/VGATextModeConsole.cpp
+    Devices/GPU/DisplayConnector.cpp
+    Devices/GPU/Generic/DisplayConnector.cpp
+    Devices/GPU/Management.cpp
+    Devices/GPU/Intel/Auxiliary/GMBusConnector.cpp
+    Devices/GPU/Intel/Plane/DisplayPlane.cpp
+    Devices/GPU/Intel/Plane/G33DisplayPlane.cpp
+    Devices/GPU/Intel/Transcoder/AnalogDisplayTranscoder.cpp
+    Devices/GPU/Intel/Transcoder/DisplayTranscoder.cpp
+    Devices/GPU/Intel/Transcoder/PLL.cpp
+    Devices/GPU/Intel/DisplayConnectorGroup.cpp
+    Devices/GPU/Intel/NativeDisplayConnector.cpp
+    Devices/GPU/Intel/NativeGraphicsAdapter.cpp
+    Devices/GPU/VMWare/Console.cpp
+    Devices/GPU/VMWare/GraphicsAdapter.cpp
+    Devices/GPU/VMWare/DisplayConnector.cpp
+    Devices/GPU/VirtIO/DisplayConnector.cpp
+    Devices/GPU/VirtIO/Console.cpp
+    Devices/GPU/VirtIO/GPU3DDevice.cpp
+    Devices/GPU/VirtIO/GraphicsAdapter.cpp
     Devices/Storage/ATA/AHCI/Controller.cpp
     Devices/Storage/ATA/AHCI/Port.cpp
     Devices/Storage/ATA/AHCI/InterruptHandler.cpp
@@ -89,31 +114,6 @@ set(KERNEL_SOURCES
     Devices/Storage/StorageController.cpp
     Devices/Storage/StorageDevice.cpp
     Devices/Storage/StorageManagement.cpp
-    Graphics/Bochs/GraphicsAdapter.cpp
-    Graphics/Bochs/QEMUDisplayConnector.cpp
-    Graphics/Console/BootFramebufferConsole.cpp
-    Graphics/Console/GenericFramebufferConsole.cpp
-    Graphics/Console/ContiguousFramebufferConsole.cpp
-    Graphics/Console/VGATextModeConsole.cpp
-    Graphics/DisplayConnector.cpp
-    Graphics/Generic/DisplayConnector.cpp
-    Graphics/GraphicsManagement.cpp
-    Graphics/Intel/Auxiliary/GMBusConnector.cpp
-    Graphics/Intel/Plane/DisplayPlane.cpp
-    Graphics/Intel/Plane/G33DisplayPlane.cpp
-    Graphics/Intel/Transcoder/AnalogDisplayTranscoder.cpp
-    Graphics/Intel/Transcoder/DisplayTranscoder.cpp
-    Graphics/Intel/Transcoder/PLL.cpp
-    Graphics/Intel/DisplayConnectorGroup.cpp
-    Graphics/Intel/NativeDisplayConnector.cpp
-    Graphics/Intel/NativeGraphicsAdapter.cpp
-    Graphics/VMWare/Console.cpp
-    Graphics/VMWare/GraphicsAdapter.cpp
-    Graphics/VMWare/DisplayConnector.cpp
-    Graphics/VirtIOGPU/DisplayConnector.cpp
-    Graphics/VirtIOGPU/Console.cpp
-    Graphics/VirtIOGPU/GPU3DDevice.cpp
-    Graphics/VirtIOGPU/GraphicsAdapter.cpp
     SanCov.cpp
     FileSystem/AnonymousFile.cpp
     FileSystem/BlockBasedFileSystem.cpp

Kernel/Devices/GPU/Bochs/GraphicsAdapter.cpp

@@ -12,11 +12,11 @@
 #endif
 #include <Kernel/Bus/PCI/API.h>
 #include <Kernel/Bus/PCI/IDs.h>
-#include <Kernel/Graphics/Bochs/Definitions.h>
+#include <Kernel/Devices/GPU/Bochs/Definitions.h>
-#include <Kernel/Graphics/Bochs/GraphicsAdapter.h>
+#include <Kernel/Devices/GPU/Bochs/GraphicsAdapter.h>
-#include <Kernel/Graphics/Bochs/QEMUDisplayConnector.h>
+#include <Kernel/Devices/GPU/Bochs/QEMUDisplayConnector.h>
-#include <Kernel/Graphics/Console/ContiguousFramebufferConsole.h>
+#include <Kernel/Devices/GPU/Console/ContiguousFramebufferConsole.h>
-#include <Kernel/Graphics/GraphicsManagement.h>
+#include <Kernel/Devices/GPU/Management.h>
 #include <Kernel/Memory/TypedMapping.h>
 #include <Kernel/Sections.h>
 

Kernel/Devices/GPU/Bochs/GraphicsAdapter.h

@@ -8,9 +8,9 @@
 
 #include <AK/Types.h>
 #include <Kernel/Bus/PCI/Device.h>
-#include <Kernel/Graphics/Bochs/Definitions.h>
+#include <Kernel/Devices/GPU/Bochs/Definitions.h>
-#include <Kernel/Graphics/Console/GenericFramebufferConsole.h>
+#include <Kernel/Devices/GPU/Console/GenericFramebufferConsole.h>
-#include <Kernel/Graphics/GenericGraphicsAdapter.h>
+#include <Kernel/Devices/GPU/GenericGraphicsAdapter.h>
 #include <Kernel/Memory/PhysicalAddress.h>
 #include <Kernel/Memory/TypedMapping.h>
 

Kernel/Devices/GPU/Bochs/QEMUDisplayConnector.cpp

@@ -6,9 +6,9 @@
 
 #include <Kernel/Debug.h>
 #include <Kernel/Devices/DeviceManagement.h>
-#include <Kernel/Graphics/Bochs/QEMUDisplayConnector.h>
+#include <Kernel/Devices/GPU/Bochs/QEMUDisplayConnector.h>
-#include <Kernel/Graphics/Console/ContiguousFramebufferConsole.h>
+#include <Kernel/Devices/GPU/Console/ContiguousFramebufferConsole.h>
-#include <Kernel/Graphics/GraphicsManagement.h>
+#include <Kernel/Devices/GPU/Management.h>
 #include <LibEDID/Definitions.h>
 
 namespace Kernel {

Kernel/Devices/GPU/Bochs/QEMUDisplayConnector.h

@@ -7,9 +7,9 @@
 #pragma once
 
 #include <AK/Try.h>
-#include <Kernel/Graphics/Bochs/Definitions.h>
+#include <Kernel/Devices/GPU/Bochs/Definitions.h>
-#include <Kernel/Graphics/Console/GenericFramebufferConsole.h>
+#include <Kernel/Devices/GPU/Console/GenericFramebufferConsole.h>
-#include <Kernel/Graphics/DisplayConnector.h>
+#include <Kernel/Devices/GPU/DisplayConnector.h>
 #include <Kernel/Library/LockRefPtr.h>
 #include <Kernel/Locking/Spinlock.h>
 #include <Kernel/Memory/TypedMapping.h>

Kernel/Devices/GPU/Console/BootFramebufferConsole.cpp

@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: BSD-2-Clause
  */
 
-#include <Kernel/Graphics/Console/BootFramebufferConsole.h>
+#include <Kernel/Devices/GPU/Console/BootFramebufferConsole.h>
 #include <Kernel/Locking/Spinlock.h>
 #include <Kernel/Memory/MemoryManager.h>
 

Kernel/Devices/GPU/Console/BootFramebufferConsole.h

@@ -6,8 +6,8 @@
 
 #pragma once
 
+#include <Kernel/Devices/GPU/Console/GenericFramebufferConsole.h>
 #include <Kernel/Forward.h>
-#include <Kernel/Graphics/Console/GenericFramebufferConsole.h>
 
 namespace Kernel::Graphics {
 

Kernel/Devices/GPU/Console/Console.h

@@ -8,7 +8,7 @@
 
 #include <AK/AtomicRefCounted.h>
 #include <AK/Types.h>
-#include <Kernel/Graphics/GenericGraphicsAdapter.h>
+#include <Kernel/Devices/GPU/GenericGraphicsAdapter.h>
 
 namespace Kernel::Graphics {
 

Kernel/Devices/GPU/Console/ContiguousFramebufferConsole.cpp

@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: BSD-2-Clause
  */
 
-#include <Kernel/Graphics/Console/ContiguousFramebufferConsole.h>
+#include <Kernel/Devices/GPU/Console/ContiguousFramebufferConsole.h>
 #include <Kernel/TTY/ConsoleManagement.h>
 
 namespace Kernel::Graphics {

Kernel/Devices/GPU/Console/ContiguousFramebufferConsole.h

@@ -6,7 +6,7 @@
 
 #pragma once
 
-#include <Kernel/Graphics/Console/GenericFramebufferConsole.h>
+#include <Kernel/Devices/GPU/Console/GenericFramebufferConsole.h>
 
 namespace Kernel::Graphics {
 

Kernel/Devices/GPU/Console/GenericFramebufferConsole.cpp

@@ -5,7 +5,7 @@
  * SPDX-License-Identifier: BSD-2-Clause
  */
 
-#include <Kernel/Graphics/Console/GenericFramebufferConsole.h>
+#include <Kernel/Devices/GPU/Console/GenericFramebufferConsole.h>
 #include <Kernel/TTY/ConsoleManagement.h>
 
 namespace Kernel::Graphics {

Kernel/Devices/GPU/Console/GenericFramebufferConsole.h

@@ -7,7 +7,7 @@
 #pragma once
 
 #include <AK/Types.h>
-#include <Kernel/Graphics/Console/Console.h>
+#include <Kernel/Devices/GPU/Console/Console.h>
 #include <Kernel/Memory/PhysicalAddress.h>
 
 namespace Kernel::Graphics {

Kernel/Devices/GPU/Console/VGATextModeConsole.cpp

@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: BSD-2-Clause
  */
 
-#include <Kernel/Graphics/Console/VGATextModeConsole.h>
+#include <Kernel/Devices/GPU/Console/VGATextModeConsole.h>
-#include <Kernel/Graphics/GraphicsManagement.h>
+#include <Kernel/Devices/GPU/Management.h>
 #include <Kernel/Sections.h>
 
 namespace Kernel::Graphics {

Kernel/Devices/GPU/Console/VGATextModeConsole.h

@@ -7,7 +7,7 @@
 #pragma once
 
 #include <AK/Types.h>
-#include <Kernel/Graphics/Console/Console.h>
+#include <Kernel/Devices/GPU/Console/Console.h>
 #include <Kernel/Locking/Spinlock.h>
 
 namespace Kernel::Graphics {

Kernel/Devices/GPU/DisplayConnector.cpp

@@ -5,11 +5,11 @@
  */
 
 #include <Kernel/API/Ioctl.h>
+#include <Kernel/Devices/GPU/DisplayConnector.h>
+#include <Kernel/Devices/GPU/Management.h>
 #include <Kernel/FileSystem/SysFS/Subsystems/DeviceIdentifiers/CharacterDevicesDirectory.h>
 #include <Kernel/FileSystem/SysFS/Subsystems/Devices/Graphics/DisplayConnector/DeviceDirectory.h>
 #include <Kernel/FileSystem/SysFS/Subsystems/Devices/Graphics/DisplayConnector/Directory.h>
-#include <Kernel/Graphics/DisplayConnector.h>
-#include <Kernel/Graphics/GraphicsManagement.h>
 #include <Kernel/Memory/MemoryManager.h>
 
 namespace Kernel {

Kernel/Devices/GPU/Generic/DisplayConnector.cpp

@@ -5,9 +5,9 @@
  */
 
 #include <Kernel/Devices/DeviceManagement.h>
-#include <Kernel/Graphics/Console/ContiguousFramebufferConsole.h>
+#include <Kernel/Devices/GPU/Console/ContiguousFramebufferConsole.h>
-#include <Kernel/Graphics/Generic/DisplayConnector.h>
+#include <Kernel/Devices/GPU/Generic/DisplayConnector.h>
-#include <Kernel/Graphics/GraphicsManagement.h>
+#include <Kernel/Devices/GPU/Management.h>
 
 namespace Kernel {
 

Kernel/Devices/GPU/Generic/DisplayConnector.h

@@ -7,8 +7,8 @@
 #pragma once
 
 #include <AK/Try.h>
-#include <Kernel/Graphics/Console/GenericFramebufferConsole.h>
+#include <Kernel/Devices/GPU/Console/GenericFramebufferConsole.h>
-#include <Kernel/Graphics/DisplayConnector.h>
+#include <Kernel/Devices/GPU/DisplayConnector.h>
 #include <Kernel/Library/LockRefPtr.h>
 #include <Kernel/Locking/Spinlock.h>
 #include <Kernel/Memory/TypedMapping.h>

Kernel/Devices/GPU/Intel/Auxiliary/GMBusConnector.cpp

@@ -5,7 +5,7 @@
  */
 
 #include <Kernel/Arch/Delay.h>
-#include <Kernel/Graphics/Intel/Auxiliary/GMBusConnector.h>
+#include <Kernel/Devices/GPU/Intel/Auxiliary/GMBusConnector.h>
 #include <Kernel/Memory/PhysicalAddress.h>
 
 namespace Kernel {

Kernel/Devices/GPU/Intel/DisplayConnectorGroup.cpp

@@ -8,12 +8,12 @@
 #include <Kernel/Bus/PCI/API.h>
 #include <Kernel/Debug.h>
 #include <Kernel/Devices/DeviceManagement.h>
-#include <Kernel/Graphics/Console/ContiguousFramebufferConsole.h>
+#include <Kernel/Devices/GPU/Console/ContiguousFramebufferConsole.h>
-#include <Kernel/Graphics/GraphicsManagement.h>
+#include <Kernel/Devices/GPU/Intel/DisplayConnectorGroup.h>
-#include <Kernel/Graphics/Intel/DisplayConnectorGroup.h>
+#include <Kernel/Devices/GPU/Intel/Plane/G33DisplayPlane.h>
-#include <Kernel/Graphics/Intel/Plane/G33DisplayPlane.h>
+#include <Kernel/Devices/GPU/Intel/Transcoder/AnalogDisplayTranscoder.h>
-#include <Kernel/Graphics/Intel/Transcoder/AnalogDisplayTranscoder.h>
+#include <Kernel/Devices/GPU/Intel/Transcoder/PLL.h>
-#include <Kernel/Graphics/Intel/Transcoder/PLL.h>
+#include <Kernel/Devices/GPU/Management.h>
 #include <Kernel/Memory/Region.h>
 #include <Kernel/Memory/TypedMapping.h>
 

Kernel/Devices/GPU/Intel/DisplayConnectorGroup.h

@@ -8,12 +8,12 @@
 
 #include <AK/RefPtr.h>
 #include <AK/Try.h>
-#include <Kernel/Graphics/Console/GenericFramebufferConsole.h>
+#include <Kernel/Devices/GPU/Console/GenericFramebufferConsole.h>
-#include <Kernel/Graphics/Intel/Auxiliary/GMBusConnector.h>
+#include <Kernel/Devices/GPU/Intel/Auxiliary/GMBusConnector.h>
-#include <Kernel/Graphics/Intel/Definitions.h>
+#include <Kernel/Devices/GPU/Intel/Definitions.h>
-#include <Kernel/Graphics/Intel/NativeDisplayConnector.h>
+#include <Kernel/Devices/GPU/Intel/NativeDisplayConnector.h>
-#include <Kernel/Graphics/Intel/Plane/DisplayPlane.h>
+#include <Kernel/Devices/GPU/Intel/Plane/DisplayPlane.h>
-#include <Kernel/Graphics/Intel/Transcoder/DisplayTranscoder.h>
+#include <Kernel/Devices/GPU/Intel/Transcoder/DisplayTranscoder.h>
 #include <Kernel/Library/LockRefPtr.h>
 #include <Kernel/Memory/TypedMapping.h>
 #include <LibEDID/EDID.h>

Kernel/Devices/GPU/Intel/NativeDisplayConnector.cpp

@@ -8,10 +8,10 @@
 #include <Kernel/Bus/PCI/API.h>
 #include <Kernel/Debug.h>
 #include <Kernel/Devices/DeviceManagement.h>
-#include <Kernel/Graphics/Console/ContiguousFramebufferConsole.h>
+#include <Kernel/Devices/GPU/Console/ContiguousFramebufferConsole.h>
-#include <Kernel/Graphics/GraphicsManagement.h>
+#include <Kernel/Devices/GPU/Intel/DisplayConnectorGroup.h>
-#include <Kernel/Graphics/Intel/DisplayConnectorGroup.h>
+#include <Kernel/Devices/GPU/Intel/NativeDisplayConnector.h>
-#include <Kernel/Graphics/Intel/NativeDisplayConnector.h>
+#include <Kernel/Devices/GPU/Management.h>
 #include <Kernel/Memory/Region.h>
 
 namespace Kernel {

Kernel/Devices/GPU/Intel/NativeDisplayConnector.h

@@ -7,10 +7,10 @@
 #pragma once
 
 #include <AK/Try.h>
-#include <Kernel/Graphics/Console/GenericFramebufferConsole.h>
+#include <Kernel/Devices/GPU/Console/GenericFramebufferConsole.h>
-#include <Kernel/Graphics/Definitions.h>
+#include <Kernel/Devices/GPU/Definitions.h>
-#include <Kernel/Graphics/DisplayConnector.h>
+#include <Kernel/Devices/GPU/DisplayConnector.h>
-#include <Kernel/Graphics/Intel/Auxiliary/GMBusConnector.h>
+#include <Kernel/Devices/GPU/Intel/Auxiliary/GMBusConnector.h>
 #include <Kernel/Library/LockRefPtr.h>
 #include <Kernel/Memory/TypedMapping.h>
 

Kernel/Devices/GPU/Intel/NativeGraphicsAdapter.cpp

@@ -5,10 +5,10 @@
  */
 
 #include <Kernel/Bus/PCI/API.h>
-#include <Kernel/Graphics/Console/ContiguousFramebufferConsole.h>
+#include <Kernel/Devices/GPU/Console/ContiguousFramebufferConsole.h>
-#include <Kernel/Graphics/Definitions.h>
+#include <Kernel/Devices/GPU/Definitions.h>
-#include <Kernel/Graphics/GraphicsManagement.h>
+#include <Kernel/Devices/GPU/Intel/NativeGraphicsAdapter.h>
-#include <Kernel/Graphics/Intel/NativeGraphicsAdapter.h>
+#include <Kernel/Devices/GPU/Management.h>
 #include <Kernel/Memory/PhysicalAddress.h>
 
 namespace Kernel {

Kernel/Devices/GPU/Intel/NativeGraphicsAdapter.h

@@ -8,9 +8,9 @@
 
 #include <AK/Types.h>
 #include <Kernel/Bus/PCI/Device.h>
-#include <Kernel/Graphics/Definitions.h>
+#include <Kernel/Devices/GPU/Definitions.h>
-#include <Kernel/Graphics/Intel/DisplayConnectorGroup.h>
+#include <Kernel/Devices/GPU/Intel/DisplayConnectorGroup.h>
-#include <Kernel/Graphics/Intel/NativeDisplayConnector.h>
+#include <Kernel/Devices/GPU/Intel/NativeDisplayConnector.h>
 #include <Kernel/Memory/PhysicalAddress.h>
 #include <LibEDID/EDID.h>
 

Kernel/Devices/GPU/Intel/Plane/DisplayPlane.cpp

@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: BSD-2-Clause
  */
 
-#include <Kernel/Graphics/Intel/Plane/DisplayPlane.h>
+#include <Kernel/Devices/GPU/Intel/Plane/DisplayPlane.h>
 #include <Kernel/Memory/PhysicalAddress.h>
 
 namespace Kernel {

Kernel/Devices/GPU/Intel/Plane/DisplayPlane.h

@@ -9,8 +9,8 @@
 #include <AK/RefPtr.h>
 #include <AK/Try.h>
 #include <AK/Types.h>
-#include <Kernel/Graphics/DisplayConnector.h>
+#include <Kernel/Devices/GPU/DisplayConnector.h>
-#include <Kernel/Graphics/Intel/Definitions.h>
+#include <Kernel/Devices/GPU/Intel/Definitions.h>
 #include <Kernel/Locking/Spinlock.h>
 #include <Kernel/Memory/TypedMapping.h>
 

Kernel/Devices/GPU/Intel/Plane/G33DisplayPlane.cpp

@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: BSD-2-Clause
  */
 
-#include <Kernel/Graphics/Intel/Plane/G33DisplayPlane.h>
+#include <Kernel/Devices/GPU/Intel/Plane/G33DisplayPlane.h>
 #include <Kernel/Memory/PhysicalAddress.h>
 
 namespace Kernel {

Kernel/Devices/GPU/Intel/Plane/G33DisplayPlane.h

@@ -9,7 +9,7 @@
 #include <AK/RefPtr.h>
 #include <AK/Try.h>
 #include <AK/Types.h>
-#include <Kernel/Graphics/Intel/Plane/DisplayPlane.h>
+#include <Kernel/Devices/GPU/Intel/Plane/DisplayPlane.h>
 
 namespace Kernel {
 

Kernel/Devices/GPU/Intel/Transcoder/AnalogDisplayTranscoder.cpp

@@ -5,7 +5,7 @@
  */
 
 #include <Kernel/Arch/Delay.h>
-#include <Kernel/Graphics/Intel/Transcoder/AnalogDisplayTranscoder.h>
+#include <Kernel/Devices/GPU/Intel/Transcoder/AnalogDisplayTranscoder.h>
 #include <Kernel/Memory/PhysicalAddress.h>
 
 namespace Kernel {

Kernel/Devices/GPU/Intel/Transcoder/AnalogDisplayTranscoder.h

@@ -9,7 +9,7 @@
 #include <AK/RefPtr.h>
 #include <AK/Try.h>
 #include <AK/Types.h>
-#include <Kernel/Graphics/Intel/Transcoder/DisplayTranscoder.h>
+#include <Kernel/Devices/GPU/Intel/Transcoder/DisplayTranscoder.h>
 
 namespace Kernel {
 

Kernel/Devices/GPU/Intel/Transcoder/DisplayTranscoder.cpp

@@ -5,7 +5,7 @@
  */
 
 #include <Kernel/Arch/Delay.h>
-#include <Kernel/Graphics/Intel/Transcoder/DisplayTranscoder.h>
+#include <Kernel/Devices/GPU/Intel/Transcoder/DisplayTranscoder.h>
 #include <Kernel/Memory/PhysicalAddress.h>
 
 namespace Kernel {

Kernel/Devices/GPU/Intel/Transcoder/DisplayTranscoder.h

@@ -9,8 +9,8 @@
 #include <AK/RefPtr.h>
 #include <AK/Try.h>
 #include <AK/Types.h>
-#include <Kernel/Graphics/DisplayConnector.h>
+#include <Kernel/Devices/GPU/DisplayConnector.h>
-#include <Kernel/Graphics/Intel/Definitions.h>
+#include <Kernel/Devices/GPU/Intel/Definitions.h>
 #include <Kernel/Locking/Spinlock.h>
 #include <Kernel/Memory/TypedMapping.h>
 

Kernel/Devices/GPU/Intel/Transcoder/PLL.cpp

@@ -6,7 +6,7 @@
 
 #include <AK/Format.h>
 #include <Kernel/Debug.h>
-#include <Kernel/Graphics/Intel/Transcoder/PLL.h>
+#include <Kernel/Devices/GPU/Intel/Transcoder/PLL.h>
 
 namespace Kernel::IntelGraphics {
 

Kernel/Devices/GPU/Intel/Transcoder/PLL.h

@@ -7,7 +7,7 @@
 #pragma once
 
 #include <AK/Optional.h>
-#include <Kernel/Graphics/Intel/Definitions.h>
+#include <Kernel/Devices/GPU/Intel/Definitions.h>
 
 namespace Kernel::IntelGraphics {
 

Kernel/Devices/GPU/Management.cpp

@@ -13,12 +13,12 @@
 #include <Kernel/Boot/Multiboot.h>
 #include <Kernel/Bus/PCI/API.h>
 #include <Kernel/Bus/PCI/IDs.h>
-#include <Kernel/Graphics/Bochs/GraphicsAdapter.h>
+#include <Kernel/Devices/GPU/Bochs/GraphicsAdapter.h>
-#include <Kernel/Graphics/Console/BootFramebufferConsole.h>
+#include <Kernel/Devices/GPU/Console/BootFramebufferConsole.h>
-#include <Kernel/Graphics/GraphicsManagement.h>
+#include <Kernel/Devices/GPU/Intel/NativeGraphicsAdapter.h>
-#include <Kernel/Graphics/Intel/NativeGraphicsAdapter.h>
+#include <Kernel/Devices/GPU/Management.h>
-#include <Kernel/Graphics/VMWare/GraphicsAdapter.h>
+#include <Kernel/Devices/GPU/VMWare/GraphicsAdapter.h>
-#include <Kernel/Graphics/VirtIOGPU/GraphicsAdapter.h>
+#include <Kernel/Devices/GPU/VirtIO/GraphicsAdapter.h>
 #include <Kernel/Memory/AnonymousVMObject.h>
 #include <Kernel/Sections.h>
 

Kernel/Devices/GPU/Management.h

@@ -13,11 +13,11 @@
 #    include <Kernel/Arch/x86_64/VGA/IOArbiter.h>
 #endif
 #include <Kernel/Bus/PCI/Definitions.h>
-#include <Kernel/Graphics/Console/Console.h>
+#include <Kernel/Devices/GPU/Console/Console.h>
-#include <Kernel/Graphics/DisplayConnector.h>
+#include <Kernel/Devices/GPU/DisplayConnector.h>
-#include <Kernel/Graphics/Generic/DisplayConnector.h>
+#include <Kernel/Devices/GPU/Generic/DisplayConnector.h>
-#include <Kernel/Graphics/GenericGraphicsAdapter.h>
+#include <Kernel/Devices/GPU/GenericGraphicsAdapter.h>
-#include <Kernel/Graphics/VirtIOGPU/GraphicsAdapter.h>
+#include <Kernel/Devices/GPU/VirtIO/GraphicsAdapter.h>
 #include <Kernel/Library/NonnullLockRefPtr.h>
 #include <Kernel/Memory/Region.h>
 

Kernel/Devices/GPU/VMWare/Console.cpp

@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: BSD-2-Clause
  */
 
-#include <Kernel/Graphics/VMWare/Console.h>
+#include <Kernel/Devices/GPU/VMWare/Console.h>
 #include <Kernel/Tasks/WorkQueue.h>
 
 namespace Kernel {

Kernel/Devices/GPU/VMWare/Console.h

@@ -6,8 +6,8 @@
 
 #pragma once
 
-#include <Kernel/Graphics/Console/GenericFramebufferConsole.h>
+#include <Kernel/Devices/GPU/Console/GenericFramebufferConsole.h>
-#include <Kernel/Graphics/VMWare/DisplayConnector.h>
+#include <Kernel/Devices/GPU/VMWare/DisplayConnector.h>
 #include <Kernel/Time/TimerQueue.h>
 
 namespace Kernel {

Kernel/Devices/GPU/VMWare/DisplayConnector.cpp

@@ -5,9 +5,9 @@
  */
 
 #include <Kernel/Devices/DeviceManagement.h>
-#include <Kernel/Graphics/GraphicsManagement.h>
+#include <Kernel/Devices/GPU/Management.h>
-#include <Kernel/Graphics/VMWare/Console.h>
+#include <Kernel/Devices/GPU/VMWare/Console.h>
-#include <Kernel/Graphics/VMWare/DisplayConnector.h>
+#include <Kernel/Devices/GPU/VMWare/DisplayConnector.h>
 
 namespace Kernel {
 

Kernel/Devices/GPU/VMWare/DisplayConnector.h

@@ -7,9 +7,9 @@
 #pragma once
 
 #include <AK/Try.h>
-#include <Kernel/Graphics/Console/GenericFramebufferConsole.h>
+#include <Kernel/Devices/GPU/Console/GenericFramebufferConsole.h>
-#include <Kernel/Graphics/DisplayConnector.h>
+#include <Kernel/Devices/GPU/DisplayConnector.h>
-#include <Kernel/Graphics/VMWare/GraphicsAdapter.h>
+#include <Kernel/Devices/GPU/VMWare/GraphicsAdapter.h>
 #include <Kernel/Library/LockRefPtr.h>
 #include <Kernel/Locking/Spinlock.h>
 #include <Kernel/Memory/TypedMapping.h>

Kernel/Devices/GPU/VMWare/GraphicsAdapter.cpp

@@ -9,11 +9,11 @@
 #include <AK/Try.h>
 #include <Kernel/Bus/PCI/API.h>
 #include <Kernel/Bus/PCI/IDs.h>
-#include <Kernel/Graphics/Console/ContiguousFramebufferConsole.h>
+#include <Kernel/Devices/GPU/Console/ContiguousFramebufferConsole.h>
-#include <Kernel/Graphics/GraphicsManagement.h>
+#include <Kernel/Devices/GPU/Management.h>
-#include <Kernel/Graphics/VMWare/Definitions.h>
+#include <Kernel/Devices/GPU/VMWare/Definitions.h>
-#include <Kernel/Graphics/VMWare/DisplayConnector.h>
+#include <Kernel/Devices/GPU/VMWare/DisplayConnector.h>
-#include <Kernel/Graphics/VMWare/GraphicsAdapter.h>
+#include <Kernel/Devices/GPU/VMWare/GraphicsAdapter.h>
 #include <Kernel/Library/IOWindow.h>
 #include <Kernel/Memory/TypedMapping.h>
 #include <Kernel/Sections.h>

Kernel/Devices/GPU/VMWare/GraphicsAdapter.h

@@ -8,8 +8,8 @@
 
 #include <AK/Types.h>
 #include <Kernel/Bus/PCI/Device.h>
-#include <Kernel/Graphics/GenericGraphicsAdapter.h>
+#include <Kernel/Devices/GPU/GenericGraphicsAdapter.h>
-#include <Kernel/Graphics/VMWare/Definitions.h>
+#include <Kernel/Devices/GPU/VMWare/Definitions.h>
 #include <Kernel/Library/IOWindow.h>
 #include <Kernel/Locking/Spinlock.h>
 #include <Kernel/Memory/PhysicalAddress.h>

Kernel/Devices/GPU/VirtIO/Console.cpp

@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: BSD-2-Clause
  */
 
-#include <Kernel/Graphics/VirtIOGPU/Console.h>
+#include <Kernel/Devices/GPU/VirtIO/Console.h>
 #include <Kernel/TTY/ConsoleManagement.h>
 #include <Kernel/Tasks/WorkQueue.h>
 

Kernel/Devices/GPU/VirtIO/Console.h

@@ -6,8 +6,8 @@
 
 #pragma once
 
-#include <Kernel/Graphics/Console/GenericFramebufferConsole.h>
+#include <Kernel/Devices/GPU/Console/GenericFramebufferConsole.h>
-#include <Kernel/Graphics/VirtIOGPU/DisplayConnector.h>
+#include <Kernel/Devices/GPU/VirtIO/DisplayConnector.h>
 #include <Kernel/Time/TimerQueue.h>
 
 namespace Kernel::Graphics::VirtIOGPU {

Kernel/Devices/GPU/VirtIO/DisplayConnector.cpp

@@ -6,11 +6,11 @@
 
 #include <Kernel/API/VirGL.h>
 #include <Kernel/Devices/DeviceManagement.h>
-#include <Kernel/Graphics/GraphicsManagement.h>
+#include <Kernel/Devices/GPU/Management.h>
-#include <Kernel/Graphics/VirtIOGPU/Console.h>
+#include <Kernel/Devices/GPU/VirtIO/Console.h>
-#include <Kernel/Graphics/VirtIOGPU/DisplayConnector.h>
+#include <Kernel/Devices/GPU/VirtIO/DisplayConnector.h>
-#include <Kernel/Graphics/VirtIOGPU/GraphicsAdapter.h>
+#include <Kernel/Devices/GPU/VirtIO/GraphicsAdapter.h>
-#include <Kernel/Graphics/VirtIOGPU/Protocol.h>
+#include <Kernel/Devices/GPU/VirtIO/Protocol.h>
 #include <Kernel/Security/Random.h>
 
 namespace Kernel {

Kernel/Devices/GPU/VirtIO/DisplayConnector.h

@@ -9,10 +9,10 @@
 #include <AK/BinaryBufferWriter.h>
 #include <AK/DistinctNumeric.h>
 #include <Kernel/Devices/CharacterDevice.h>
-#include <Kernel/Graphics/Console/Console.h>
+#include <Kernel/Devices/GPU/Console/Console.h>
-#include <Kernel/Graphics/DisplayConnector.h>
+#include <Kernel/Devices/GPU/DisplayConnector.h>
-#include <Kernel/Graphics/VirtIOGPU/GraphicsAdapter.h>
+#include <Kernel/Devices/GPU/VirtIO/GraphicsAdapter.h>
-#include <Kernel/Graphics/VirtIOGPU/Protocol.h>
+#include <Kernel/Devices/GPU/VirtIO/Protocol.h>
 #include <Kernel/Memory/Region.h>
 #include <LibEDID/EDID.h>
 

Kernel/Devices/GPU/VirtIO/GPU3DDevice.cpp

@@ -6,11 +6,11 @@
 
 #include <Kernel/API/Ioctl.h>
 #include <Kernel/API/VirGL.h>
-#include <Kernel/Graphics/GraphicsManagement.h>
+#include <Kernel/Devices/GPU/Management.h>
-#include <Kernel/Graphics/VirtIOGPU/Console.h>
+#include <Kernel/Devices/GPU/VirtIO/Console.h>
-#include <Kernel/Graphics/VirtIOGPU/GPU3DDevice.h>
+#include <Kernel/Devices/GPU/VirtIO/GPU3DDevice.h>
-#include <Kernel/Graphics/VirtIOGPU/GraphicsAdapter.h>
+#include <Kernel/Devices/GPU/VirtIO/GraphicsAdapter.h>
-#include <Kernel/Graphics/VirtIOGPU/Protocol.h>
+#include <Kernel/Devices/GPU/VirtIO/Protocol.h>
 #include <Kernel/Security/Random.h>
 
 namespace Kernel {

Kernel/Devices/GPU/VirtIO/GPU3DDevice.h

@@ -10,7 +10,7 @@
 #include <AK/IntrusiveList.h>
 #include <Kernel/Devices/CharacterDevice.h>
 #include <Kernel/Devices/DeviceManagement.h>
-#include <Kernel/Graphics/VirtIOGPU/Protocol.h>
+#include <Kernel/Devices/GPU/VirtIO/Protocol.h>
 #include <Kernel/Locking/SpinlockProtected.h>
 
 namespace Kernel::Graphics::VirtIOGPU {

Kernel/Devices/GPU/VirtIO/GraphicsAdapter.cpp

@@ -9,12 +9,12 @@
 #include <Kernel/Bus/PCI/API.h>
 #include <Kernel/Bus/PCI/IDs.h>
 #include <Kernel/Devices/DeviceManagement.h>
-#include <Kernel/Graphics/Console/GenericFramebufferConsole.h>
+#include <Kernel/Devices/GPU/Console/GenericFramebufferConsole.h>
-#include <Kernel/Graphics/GraphicsManagement.h>
+#include <Kernel/Devices/GPU/Management.h>
-#include <Kernel/Graphics/VirtIOGPU/Console.h>
+#include <Kernel/Devices/GPU/VirtIO/Console.h>
-#include <Kernel/Graphics/VirtIOGPU/DisplayConnector.h>
+#include <Kernel/Devices/GPU/VirtIO/DisplayConnector.h>
-#include <Kernel/Graphics/VirtIOGPU/GPU3DDevice.h>
+#include <Kernel/Devices/GPU/VirtIO/GPU3DDevice.h>
-#include <Kernel/Graphics/VirtIOGPU/GraphicsAdapter.h>
+#include <Kernel/Devices/GPU/VirtIO/GraphicsAdapter.h>
 
 namespace Kernel {
 

Kernel/Devices/GPU/VirtIO/GraphicsAdapter.h

@@ -10,8 +10,8 @@
 #include <AK/DistinctNumeric.h>
 #include <Kernel/Bus/VirtIO/Device.h>
 #include <Kernel/Bus/VirtIO/Queue.h>
-#include <Kernel/Graphics/GenericGraphicsAdapter.h>
+#include <Kernel/Devices/GPU/GenericGraphicsAdapter.h>
-#include <Kernel/Graphics/VirtIOGPU/Protocol.h>
+#include <Kernel/Devices/GPU/VirtIO/Protocol.h>
 
 namespace Kernel {
 

Kernel/FileSystem/SysFS/Subsystems/Devices/Graphics/DisplayConnector/DeviceAttribute.h

@@ -6,9 +6,9 @@
 
 #pragma once
 
+#include <Kernel/Devices/GPU/DisplayConnector.h>
 #include <Kernel/FileSystem/SysFS/Component.h>
 #include <Kernel/FileSystem/SysFS/Subsystems/Devices/Graphics/DisplayConnector/DeviceDirectory.h>
-#include <Kernel/Graphics/DisplayConnector.h>
 #include <Kernel/Library/KBuffer.h>
 
 namespace Kernel {

Kernel/FileSystem/SysFS/Subsystems/Devices/Graphics/DisplayConnector/DeviceDirectory.cpp

@@ -6,9 +6,9 @@
 
 #include <Kernel/Bus/PCI/API.h>
 #include <Kernel/Bus/PCI/Access.h>
+#include <Kernel/Devices/GPU/DisplayConnector.h>
 #include <Kernel/FileSystem/SysFS/Subsystems/Devices/Graphics/DisplayConnector/DeviceAttribute.h>
 #include <Kernel/FileSystem/SysFS/Subsystems/Devices/Graphics/DisplayConnector/DeviceDirectory.h>
-#include <Kernel/Graphics/DisplayConnector.h>
 #include <Kernel/Sections.h>
 
 namespace Kernel {

Kernel/FileSystem/SysFS/Subsystems/Devices/Graphics/DisplayConnector/DeviceDirectory.h

@@ -6,8 +6,8 @@
 
 #pragma once
 
+#include <Kernel/Devices/GPU/DisplayConnector.h>
 #include <Kernel/FileSystem/SysFS/Component.h>
-#include <Kernel/Graphics/DisplayConnector.h>
 #include <Kernel/Library/KString.h>
 
 namespace Kernel {

Kernel/TTY/ConsoleManagement.cpp

@@ -8,7 +8,7 @@
 #include <Kernel/Boot/CommandLine.h>
 #include <Kernel/Debug.h>
 #include <Kernel/Devices/DeviceManagement.h>
-#include <Kernel/Graphics/GraphicsManagement.h>
+#include <Kernel/Devices/GPU/Management.h>
 #include <Kernel/Library/Panic.h>
 #include <Kernel/Sections.h>
 #include <Kernel/TTY/ConsoleManagement.h>

Kernel/TTY/VirtualConsole.cpp

@@ -13,8 +13,8 @@
 #endif
 #include <Kernel/Boot/CommandLine.h>
 #include <Kernel/Devices/DeviceManagement.h>
+#include <Kernel/Devices/GPU/Management.h>
 #include <Kernel/Devices/HID/Management.h>
-#include <Kernel/Graphics/GraphicsManagement.h>
 #include <Kernel/Heap/kmalloc.h>
 #include <Kernel/Library/StdLib.h>
 #include <Kernel/Sections.h>

Kernel/TTY/VirtualConsole.h

@@ -10,9 +10,9 @@
 #include <AK/Noncopyable.h>
 #include <AK/Vector.h>
 #include <Kernel/API/KeyCode.h>
+#include <Kernel/Devices/GPU/Console/Console.h>
 #include <Kernel/Devices/Generic/ConsoleDevice.h>
 #include <Kernel/Devices/HID/Management.h>
-#include <Kernel/Graphics/Console/Console.h>
 #include <Kernel/TTY/TTY.h>
 #include <LibVT/Attribute.h>
 #include <LibVT/Color.h>

Kernel/kprintf.cpp

@@ -12,10 +12,10 @@
 #    include <Kernel/Arch/x86_64/BochsDebugOutput.h>
 #endif
 #include <Kernel/Devices/DeviceManagement.h>
+#include <Kernel/Devices/GPU/Console/BootFramebufferConsole.h>
+#include <Kernel/Devices/GPU/Management.h>
 #include <Kernel/Devices/Generic/ConsoleDevice.h>
 #include <Kernel/Devices/PCISerialDevice.h>
-#include <Kernel/Graphics/Console/BootFramebufferConsole.h>
-#include <Kernel/Graphics/GraphicsManagement.h>
 #include <Kernel/Locking/Spinlock.h>
 #include <Kernel/TTY/ConsoleManagement.h>
 #include <Kernel/kstdio.h>