From 50429d3b22224a4d9bdc1cf336a93c6bbb0d9ca2 Mon Sep 17 00:00:00 2001
From: Liav A <liavalb@gmail.com>
Date: Fri, 8 Sep 2023 21:51:58 +0300
Subject: [PATCH] LibC+Kernel: Move GPU-related API methods to a LibC header
 file

The Kernel/API directory in general shouldn't include userspace code,
but structure definitions that both are shared between the Kernel and
userspace.

All users of the ioctl API obviously use LibC so LibC is the most common
and shared library for the affected programs.
---
 .../API/Graphics.h => Userland/Libraries/LibC/sys/devices/gpu.h | 0
 Userland/Libraries/LibEDID/EDID.cpp                             | 2 +-
 Userland/Services/WindowServer/HardwareScreenBackend.cpp        | 2 +-
 Userland/Services/WindowServer/Screen.cpp                       | 2 +-
 Userland/Services/WindowServer/ScreenLayout.ipp                 | 2 +-
 Userland/Services/WindowServer/main.cpp                         | 2 +-
 6 files changed, 5 insertions(+), 5 deletions(-)
 rename Kernel/API/Graphics.h => Userland/Libraries/LibC/sys/devices/gpu.h (100%)

diff --git a/Kernel/API/Graphics.h b/Userland/Libraries/LibC/sys/devices/gpu.h
similarity index 100%
rename from Kernel/API/Graphics.h
rename to Userland/Libraries/LibC/sys/devices/gpu.h
diff --git a/Userland/Libraries/LibEDID/EDID.cpp b/Userland/Libraries/LibEDID/EDID.cpp
index c75bfbd92d..940399643a 100644
--- a/Userland/Libraries/LibEDID/EDID.cpp
+++ b/Userland/Libraries/LibEDID/EDID.cpp
@@ -14,8 +14,8 @@
 #    include <Kernel/Library/StdLib.h>
 #else
 #    include <AK/ScopeGuard.h>
-#    include <Kernel/API/Graphics.h>
 #    include <fcntl.h>
+#    include <sys/devices/gpu.h>
 #    include <unistd.h>
 
 #    if ENABLE_PNP_IDS_DATA
diff --git a/Userland/Services/WindowServer/HardwareScreenBackend.cpp b/Userland/Services/WindowServer/HardwareScreenBackend.cpp
index 39cb0252bd..4a421a346d 100644
--- a/Userland/Services/WindowServer/HardwareScreenBackend.cpp
+++ b/Userland/Services/WindowServer/HardwareScreenBackend.cpp
@@ -8,10 +8,10 @@
 #include "HardwareScreenBackend.h"
 #include "ScreenBackend.h"
 #include <AK/Try.h>
-#include <Kernel/API/Graphics.h>
 #include <LibCore/System.h>
 #include <fcntl.h>
 #include <stdio.h>
+#include <sys/devices/gpu.h>
 #include <sys/mman.h>
 #include <unistd.h>
 
diff --git a/Userland/Services/WindowServer/Screen.cpp b/Userland/Services/WindowServer/Screen.cpp
index 2ce1ea4337..895155b22e 100644
--- a/Userland/Services/WindowServer/Screen.cpp
+++ b/Userland/Services/WindowServer/Screen.cpp
@@ -14,10 +14,10 @@
 #include "WindowManager.h"
 #include <AK/Debug.h>
 #include <AK/Format.h>
-#include <Kernel/API/Graphics.h>
 #include <Kernel/API/MousePacket.h>
 #include <fcntl.h>
 #include <stdio.h>
+#include <sys/devices/gpu.h>
 #include <sys/mman.h>
 #include <unistd.h>
 
diff --git a/Userland/Services/WindowServer/ScreenLayout.ipp b/Userland/Services/WindowServer/ScreenLayout.ipp
index 55a6bb8bb6..311bfd34c0 100644
--- a/Userland/Services/WindowServer/ScreenLayout.ipp
+++ b/Userland/Services/WindowServer/ScreenLayout.ipp
@@ -5,7 +5,7 @@
  */
 
 #include <AK/ScopeGuard.h>
-#include <Kernel/API/Graphics.h>
+#include <sys/devices/gpu.h>
 #include <LibIPC/Decoder.h>
 #include <LibIPC/Encoder.h>
 #include <Services/WindowServer/ScreenLayout.h>
diff --git a/Userland/Services/WindowServer/main.cpp b/Userland/Services/WindowServer/main.cpp
index c71efa5f76..9c95ea624e 100644
--- a/Userland/Services/WindowServer/main.cpp
+++ b/Userland/Services/WindowServer/main.cpp
@@ -9,7 +9,6 @@
 #include "EventLoop.h"
 #include "Screen.h"
 #include "WindowManager.h"
-#include <Kernel/API/Graphics.h>
 #include <LibCore/ConfigFile.h>
 #include <LibCore/DirIterator.h>
 #include <LibCore/System.h>
@@ -18,6 +17,7 @@
 #include <LibGfx/SystemTheme.h>
 #include <LibMain/Main.h>
 #include <signal.h>
+#include <sys/devices/gpu.h>
 
 namespace WindowServer {
 RefPtr<Core::ConfigFile> g_config;