drm-uapi: use local files, not system libdrm

There was an issue recently caused by the system header being included
by mistake, so let's just get rid of this include path and always
explicitly #include "drm-uapi/FOO.h"

Signed-off-by: Eric Engestrom <[email protected]>
Reviewed-by: Kristian H. Kristensen <[email protected]>

19 files changed, 25 insertions, 27 deletions

diff --git a/src/intel/Android.dev.mk b/src/intel/Android.dev.mk
index cd2ed66a176..4f14b0362d7 100644
--- a/src/intel/Android.dev.mk
+++ b/src/intel/Android.dev.mk
@@ -29,7 +29,7 @@ LOCAL_MODULE := libmesa_intel_dev
 
 LOCAL_MODULE_CLASS := STATIC_LIBRARIES
 
-LOCAL_C_INCLUDES := $(MESA_TOP)/include/drm-uapi
+LOCAL_C_INCLUDES := $(MESA_TOP)/include
 
 LOCAL_SRC_FILES := $(DEV_FILES)
 
diff --git a/src/intel/Android.vulkan.mk b/src/intel/Android.vulkan.mk
index 7019c8cbc8f..04c9d5b3e4e 100644
--- a/src/intel/Android.vulkan.mk
+++ b/src/intel/Android.vulkan.mk
@@ -36,7 +36,6 @@ VULKAN_COMMON_INCLUDES := \
 	$(MESA_TOP)/src/vulkan/wsi \
 	$(MESA_TOP)/src/vulkan/util \
 	$(MESA_TOP)/src/intel \
-	$(MESA_TOP)/include/drm-uapi \
 	$(MESA_TOP)/src/intel/vulkan \
 	$(MESA_TOP)/src/compiler \
 	frameworks/native/vulkan/include
diff --git a/src/intel/Makefile.am b/src/intel/Makefile.am
index 5a2518d8d72..a6df653adef 100644
--- a/src/intel/Makefile.am
+++ b/src/intel/Makefile.am
@@ -33,7 +33,6 @@ AM_CPPFLAGS = \
 	-I$(top_srcdir)/src/gtest/include \
 	-I$(top_builddir)/src/intel \
 	-I$(top_srcdir)/src/intel \
-	-I$(top_srcdir)/include/drm-uapi \
 	-I$(top_srcdir)/src/mapi \
 	-I$(top_srcdir)/src/mesa \
 	-I$(top_srcdir)/src/gallium/auxiliary \
diff --git a/src/intel/Makefile.vulkan.am b/src/intel/Makefile.vulkan.am
index cad0a57bc7f..7d9a74c9301 100644
--- a/src/intel/Makefile.vulkan.am
+++ b/src/intel/Makefile.vulkan.am
@@ -109,7 +109,7 @@ VULKAN_CFLAGS = \
 VULKAN_CPPFLAGS = \
 	-I$(top_srcdir)/src/compiler \
 	-I$(top_srcdir)/src/intel/compiler \
-	-I$(top_srcdir)/include/drm-uapi \
+	-I$(top_srcdir)/include \
 	-I$(top_builddir)/src/intel/vulkan \
 	-I$(top_srcdir)/src/intel/vulkan \
 	-I$(top_srcdir)/src/vulkan/wsi \
diff --git a/src/intel/common/gen_defines.h b/src/intel/common/gen_defines.h
index d1d63a17f11..2f8715821cf 100644
--- a/src/intel/common/gen_defines.h
+++ b/src/intel/common/gen_defines.h
@@ -25,7 +25,7 @@
 #ifndef GEN_DEFINES_H
 #define GEN_DEFINES_H
 
-#include "i915_drm.h"
+#include "drm-uapi/i915_drm.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/src/intel/dev/gen_device_info.c b/src/intel/dev/gen_device_info.c
index 5dbd0607572..b30d31927a6 100644
--- a/src/intel/dev/gen_device_info.c
+++ b/src/intel/dev/gen_device_info.c
@@ -31,7 +31,7 @@
 #include "util/bitscan.h"
 #include "util/macros.h"
 
-#include <i915_drm.h>
+#include "drm-uapi/i915_drm.h"
 
 /**
  * Get the PCI ID for the device name.
diff --git a/src/intel/dev/meson.build b/src/intel/dev/meson.build
index 9369fd3c0da..a46a4d79226 100644
--- a/src/intel/dev/meson.build
+++ b/src/intel/dev/meson.build
@@ -28,6 +28,6 @@ files_libintel_dev = files(
 libintel_dev = static_library(
   ['intel_dev'],
   files_libintel_dev,
-  include_directories : [inc_common, inc_intel, inc_drm_uapi],
+  include_directories : [inc_common, inc_intel, inc_include],
   c_args : [c_vis_args, no_override_init_args],
 )
diff --git a/src/intel/isl/isl_drm.c b/src/intel/isl/isl_drm.c
index e16d7b63917..e7abe747785 100644
--- a/src/intel/isl/isl_drm.c
+++ b/src/intel/isl/isl_drm.c
@@ -24,8 +24,8 @@
 #include <assert.h>
 #include <stdlib.h>
 
-#include <drm_fourcc.h>
-#include <i915_drm.h>
+#include "drm-uapi/drm_fourcc.h"
+#include "drm-uapi/i915_drm.h"
 
 #include "isl.h"
 #include "dev/gen_device_info.h"
diff --git a/src/intel/isl/meson.build b/src/intel/isl/meson.build
index 79eb6686059..9117afb4228 100644
--- a/src/intel/isl/meson.build
+++ b/src/intel/isl/meson.build
@@ -81,7 +81,7 @@ isl_tiled_memcpy = static_library(
   'isl_tiled_memcpy',
   [files_isl_tiled_memcpy],
   include_directories : [
-    inc_common, inc_intel, inc_drm_uapi,
+    inc_common, inc_intel, inc_include,
   ],
   c_args : [c_vis_args, no_override_init_args, '-msse2'],
   extra_files : ['isl_tiled_memcpy.c']
@@ -92,7 +92,7 @@ if with_sse41
     'isl_tiled_memcpy_sse41',
     [files_isl_tiled_memcpy_sse41],
     include_directories : [
-      inc_common, inc_intel, inc_drm_uapi,
+      inc_common, inc_intel, inc_include,
     ],
     link_args : ['-Wl,--exclude-libs=ALL'],
     c_args : [c_vis_args, no_override_init_args, '-msse2', sse41_args],
@@ -115,7 +115,7 @@ libisl_files = files(
 libisl = static_library(
   'isl',
   [libisl_files, isl_format_layout_c, genX_bits_h],
-  include_directories : [inc_common, inc_intel, inc_drm_uapi],
+  include_directories : [inc_common, inc_intel, inc_include],
   link_with : [isl_gen_libs, isl_tiled_memcpy, isl_tiled_memcpy_sse41],
   c_args : [c_vis_args, no_override_init_args],
 )
diff --git a/src/intel/tools/aub_write.c b/src/intel/tools/aub_write.c
index 5d59b4ef28a..99b5e0a7b9f 100644
--- a/src/intel/tools/aub_write.c
+++ b/src/intel/tools/aub_write.c
@@ -29,7 +29,7 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "i915_drm.h"
+#include "drm-uapi/i915_drm.h"
 #include "intel_aub.h"
 #include "gen_context.h"
 
diff --git a/src/intel/tools/error2aub.c b/src/intel/tools/error2aub.c
index fb4b4ffcfc6..ca010383847 100644
--- a/src/intel/tools/error2aub.c
+++ b/src/intel/tools/error2aub.c
@@ -33,7 +33,7 @@
 #include <zlib.h>
 
 #include "aub_write.h"
-#include "i915_drm.h"
+#include "drm-uapi/i915_drm.h"
 #include "intel_aub.h"
 
 static void __attribute__ ((format(__printf__, 2, 3)))
diff --git a/src/intel/tools/intel_dump_gpu.c b/src/intel/tools/intel_dump_gpu.c
index 19e054c894c..ea541bb21fe 100644
--- a/src/intel/tools/intel_dump_gpu.c
+++ b/src/intel/tools/intel_dump_gpu.c
@@ -37,7 +37,7 @@
 #include <errno.h>
 #include <sys/mman.h>
 #include <dlfcn.h>
-#include <i915_drm.h>
+#include "drm-uapi/i915_drm.h"
 #include <inttypes.h>
 
 #include "intel_aub.h"
diff --git a/src/intel/tools/intel_sanitize_gpu.c b/src/intel/tools/intel_sanitize_gpu.c
index ddfe1768b4a..543fcf4edde 100644
--- a/src/intel/tools/intel_sanitize_gpu.c
+++ b/src/intel/tools/intel_sanitize_gpu.c
@@ -36,7 +36,7 @@
 #include <sys/sysmacros.h>
 #include <dlfcn.h>
 #include <pthread.h>
-#include <i915_drm.h>
+#include "drm-uapi/i915_drm.h"
 
 #include "util/hash_table.h"
 #include "util/u_math.h"
diff --git a/src/intel/tools/meson.build b/src/intel/tools/meson.build
index 2ef49ddc17c..1c061e251ea 100644
--- a/src/intel/tools/meson.build
+++ b/src/intel/tools/meson.build
@@ -61,7 +61,7 @@ error2aub = executable(
   'intel_error2aub',
   files('aub_write.h', 'aub_write.c', 'error2aub.c'),
   dependencies : [dep_zlib, dep_dl, dep_thread, dep_m],
-  include_directories : [inc_common, inc_intel, inc_drm_uapi],
+  include_directories : [inc_common, inc_intel, inc_include],
   link_with : [libintel_dev],
   c_args : [c_vis_args, no_override_init_args],
   install : true
@@ -84,7 +84,7 @@ libintel_sanitize_gpu = shared_library(
   'intel_sanitize_gpu',
   files('intel_sanitize_gpu.c'),
   dependencies : [dep_dl, dep_thread],
-  include_directories : [inc_common, inc_intel, inc_drm_uapi],
+  include_directories : [inc_common, inc_intel, inc_include],
   link_with : [libintel_common, libmesa_util],
   c_args : [c_vis_args, no_override_init_args, c_sse2_args],
   install_dir : get_option('libexecdir'),
@@ -106,7 +106,7 @@ libintel_dump_gpu = shared_library(
     'aub_write.h', 'aub_write.c', 'intel_dump_gpu.c',
   ),
   dependencies : dep_dl,
-  include_directories : [inc_common, inc_intel, inc_drm_uapi],
+  include_directories : [inc_common, inc_intel, inc_include],
   link_with : libintel_dev,
   c_args : [c_vis_args, no_override_init_args],
   install_dir : get_option('libexecdir'),
diff --git a/src/intel/vulkan/anv_device.c b/src/intel/vulkan/anv_device.c
index 77120937c51..74739c0da51 100644
--- a/src/intel/vulkan/anv_device.c
+++ b/src/intel/vulkan/anv_device.c
@@ -29,7 +29,7 @@
 #include <unistd.h>
 #include <fcntl.h>
 #include <xf86drm.h>
-#include <drm_fourcc.h>
+#include "drm-uapi/drm_fourcc.h"
 
 #include "anv_private.h"
 #include "util/strtod.h"
diff --git a/src/intel/vulkan/anv_formats.c b/src/intel/vulkan/anv_formats.c
index 7e9ae1ab4c4..4e15e626eed 100644
--- a/src/intel/vulkan/anv_formats.c
+++ b/src/intel/vulkan/anv_formats.c
@@ -22,7 +22,7 @@
  */
 
 #include "anv_private.h"
-#include "drm_fourcc.h"
+#include "drm-uapi/drm_fourcc.h"
 #include "vk_enum_to_str.h"
 #include "vk_format_info.h"
 #include "vk_util.h"
diff --git a/src/intel/vulkan/anv_image.c b/src/intel/vulkan/anv_image.c
index 3999c7399d0..facf7d18006 100644
--- a/src/intel/vulkan/anv_image.c
+++ b/src/intel/vulkan/anv_image.c
@@ -27,7 +27,7 @@
 #include <unistd.h>
 #include <fcntl.h>
 #include <sys/mman.h>
-#include <drm_fourcc.h>
+#include "drm-uapi/drm_fourcc.h"
 
 #include "anv_private.h"
 #include "util/debug.h"
diff --git a/src/intel/vulkan/anv_private.h b/src/intel/vulkan/anv_private.h
index 5fb7c71da40..60da96a134e 100644
--- a/src/intel/vulkan/anv_private.h
+++ b/src/intel/vulkan/anv_private.h
@@ -30,7 +30,7 @@
 #include <pthread.h>
 #include <assert.h>
 #include <stdint.h>
-#include <i915_drm.h>
+#include "drm-uapi/i915_drm.h"
 
 #ifdef HAVE_VALGRIND
 #include <valgrind.h>
diff --git a/src/intel/vulkan/meson.build b/src/intel/vulkan/meson.build
index ffd1985f251..7fa43a6ad79 100644
--- a/src/intel/vulkan/meson.build
+++ b/src/intel/vulkan/meson.build
@@ -98,7 +98,7 @@ foreach g : [['70', ['gen7_cmd_buffer.c']], ['75', ['gen7_cmd_buffer.c']],
     'anv_gen@0@'.format(_gen),
     [anv_gen_files, g[1], anv_entrypoints[0], anv_extensions_h],
     include_directories : [
-      inc_common, inc_compiler, inc_drm_uapi, inc_intel, inc_vulkan_util,
+      inc_common, inc_compiler, inc_include, inc_intel, inc_vulkan_util,
       inc_vulkan_wsi,
     ],
     c_args : [
@@ -183,7 +183,7 @@ libanv_common = static_library(
     gen_xml_pack,
   ],
   include_directories : [
-    inc_common, inc_intel, inc_compiler, inc_drm_uapi, inc_vulkan_util,
+    inc_common, inc_intel, inc_compiler, inc_include, inc_vulkan_util,
     inc_vulkan_wsi,
   ],
   c_args : anv_flags,
@@ -194,7 +194,7 @@ libvulkan_intel = shared_library(
   'vulkan_intel',
   [files('anv_gem.c'), anv_entrypoints[0], anv_extensions_h],
   include_directories : [
-    inc_common, inc_intel, inc_compiler, inc_drm_uapi, inc_vulkan_util,
+    inc_common, inc_intel, inc_compiler, inc_include, inc_vulkan_util,
     inc_vulkan_wsi,
   ],
   link_whole : [libanv_common, libanv_gen_libs],
@@ -215,7 +215,7 @@ if with_tests
     'vulkan_intel_test',
     [files('anv_gem_stubs.c'), anv_entrypoints[0], anv_extensions_h],
     include_directories : [
-      inc_common, inc_intel, inc_compiler, inc_drm_uapi, inc_vulkan_util,
+      inc_common, inc_intel, inc_compiler, inc_include, inc_vulkan_util,
       inc_vulkan_wsi,
     ],
     link_whole : libanv_common,