From e84aa455e550bb151cccbc8668c5dd64719342e9 Mon Sep 17 00:00:00 2001
From: Dmitry Osipenko <dmitry.osipenko@collabora.com>
Date: Sun, 7 Jan 2024 00:45:55 +0300
Subject: [PATCH] iris: Use Mesa internal drm-uapi headers

Iris driver includes system DRM UAPI header before the Mesa's internal
ones, which makes Iris to use the system headers. Correct the included
header for consistency with the rest of the Intel driver code by changing
the inclusion order, like it's done by the rest of the Intel driver code.

Reviewed-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
Signed-off-by: Dmitry Osipenko <dmitry.osipenko@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/27043>
---
 src/gallium/drivers/iris/iris_bufmgr.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/gallium/drivers/iris/iris_bufmgr.c b/src/gallium/drivers/iris/iris_bufmgr.c
index 088f34f1e28..d24c14cb294 100644
--- a/src/gallium/drivers/iris/iris_bufmgr.c
+++ b/src/gallium/drivers/iris/iris_bufmgr.c
@@ -31,7 +31,6 @@
  * - main interface to GEM in the kernel
  */
 
-#include <xf86drm.h>
 #include <util/u_atomic.h>
 #include <fcntl.h>
 #include <stdio.h>
@@ -72,6 +71,7 @@
 #include "xe/iris_bufmgr.h"
 
 #include "drm-uapi/i915_drm.h"
+#include <xf86drm.h>
 
 #ifdef HAVE_VALGRIND
 #include <valgrind.h>