summaryrefslogtreecommitdiffstats
path: root/src/gallium/drivers/tegra
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/gallium/drivers/tegra
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/gallium/drivers/tegra')
-rw-r--r--src/gallium/drivers/tegra/Makefile.am2
-rw-r--r--src/gallium/drivers/tegra/meson.build2
-rw-r--r--src/gallium/drivers/tegra/tegra_screen.c4
3 files changed, 4 insertions, 4 deletions
diff --git a/src/gallium/drivers/tegra/Makefile.am b/src/gallium/drivers/tegra/Makefile.am
index 1347d2548dc..75328ece242 100644
--- a/src/gallium/drivers/tegra/Makefile.am
+++ b/src/gallium/drivers/tegra/Makefile.am
@@ -2,7 +2,7 @@ include Makefile.sources
include $(top_srcdir)/src/gallium/Automake.inc
AM_CFLAGS = \
- -I$(top_srcdir)/include/drm-uapi \
+ -I$(top_srcdir)/include \
$(GALLIUM_DRIVER_CFLAGS)
noinst_LTLIBRARIES = libtegra.la
diff --git a/src/gallium/drivers/tegra/meson.build b/src/gallium/drivers/tegra/meson.build
index 79ccd143f29..d24438edc13 100644
--- a/src/gallium/drivers/tegra/meson.build
+++ b/src/gallium/drivers/tegra/meson.build
@@ -31,7 +31,7 @@ libtegra = static_library(
c_args : [c_vis_args],
include_directories : [
inc_include, inc_src, inc_gallium, inc_gallium_aux, inc_gallium_drivers,
- inc_gallium_winsys, inc_drm_uapi
+ inc_gallium_winsys,
],
)
diff --git a/src/gallium/drivers/tegra/tegra_screen.c b/src/gallium/drivers/tegra/tegra_screen.c
index 1051c167189..6e7769075d1 100644
--- a/src/gallium/drivers/tegra/tegra_screen.c
+++ b/src/gallium/drivers/tegra/tegra_screen.c
@@ -28,8 +28,8 @@
#include <sys/stat.h>
-#include <drm_fourcc.h>
-#include <tegra_drm.h>
+#include "drm-uapi/drm_fourcc.h"
+#include "drm-uapi/tegra_drm.h"
#include <xf86drm.h>
#include "loader/loader.h"