summaryrefslogtreecommitdiffstats
path: root/src/intel/dev
diff options
context:
space:
mode:
authorEric Engestrom <[email protected]>2019-02-12 18:18:03 +0000
committerEric Engestrom <[email protected]>2019-02-14 11:20:00 +0000
commitf1374805a86d0d506557e61efbc09e23caa7a038 (patch)
tree8227048a718d8080b00c1f1a9817033ce38e6cd9 /src/intel/dev
parent69e4c273c44118f46fd496af5124ddf45b86e868 (diff)
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]>
Diffstat (limited to 'src/intel/dev')
-rw-r--r--src/intel/dev/gen_device_info.c2
-rw-r--r--src/intel/dev/meson.build2
2 files changed, 2 insertions, 2 deletions
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],
)