From d76175955f1b7a3524c50f46069a27a260d96c33 Mon Sep 17 00:00:00 2001
From: Yusuf Khan <yusisamerican@gmail.com>
Date: Thu, 28 Jul 2022 13:37:45 -0500
Subject: [PATCH] nouveau/ws: remove the drm.h header

It can cause compilation issues on Arch, there is a workaround by
including it as <drm.h> but this solution is simpler.

Signed-off-by: Yusuf Khan <yusisamerican@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/24326>
---
 src/nouveau/winsys/nouveau_context.c | 3 +--
 src/nouveau/winsys/nouveau_device.c  | 3 +--
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/nouveau/winsys/nouveau_context.c b/src/nouveau/winsys/nouveau_context.c
index 78ee05666b5..1dbd63ad2f8 100644
--- a/src/nouveau/winsys/nouveau_context.c
+++ b/src/nouveau/winsys/nouveau_context.c
@@ -1,10 +1,9 @@
 #include "nouveau_context.h"
 
-#include <drm/drm.h>
+#include <xf86drm.h>
 #include <errno.h>
 #include <nouveau_drm.h>
 #include <nouveau/nvif/ioctl.h>
-#include <xf86drm.h>
 
 #include "nouveau_device.h"
 
diff --git a/src/nouveau/winsys/nouveau_device.c b/src/nouveau/winsys/nouveau_device.c
index acfd31b8fde..cffb37e23c6 100644
--- a/src/nouveau/winsys/nouveau_device.c
+++ b/src/nouveau/winsys/nouveau_device.c
@@ -1,11 +1,10 @@
 #include "nouveau_device.h"
 
-#include <drm/drm.h>
+#include <xf86drm.h>
 #include <nouveau_drm.h>
 #include <nouveau/nvif/ioctl.h>
 #include <nvif/cl0080.h>
 #include <nvif/class.h>
-#include <xf86drm.h>
 
 #include "util/u_debug.h"
 #include "util/os_file.h"