From a9387971acf45d1215fdd8af00285b92468f249b Mon Sep 17 00:00:00 2001 From: Lionel Landwerlin Date: Tue, 5 Dec 2017 16:43:01 +0000 Subject: include/drm-uapi: bump headers Taken from drm-next : commit 9c606cd4117a3c45e04a6616b1a0dbeb18eeee62 Merge: c5dd52f653fa 3997eea57caf Author: Dave Airlie Date: Thu Dec 7 06:28:22 2017 +1000 Merge branch 'drm-next-4.16' of git://people.freedesktop.org/~agd5f/linux into drm-next Signed-off-by: Lionel Landwerlin Reviewed-by: Chris Wilson --- lib/igt_gt.h | 11 ++--------- lib/meson.build | 3 ++- 2 files changed, 4 insertions(+), 10 deletions(-) (limited to 'lib') diff --git a/lib/igt_gt.h b/lib/igt_gt.h index 48ed48af..68592410 100644 --- a/lib/igt_gt.h +++ b/lib/igt_gt.h @@ -27,6 +27,8 @@ #include "igt_debugfs.h" #include "igt_core.h" +#include "i915_drm.h" + void igt_require_hang_ring(int fd, int ring); typedef struct igt_hang { @@ -92,15 +94,6 @@ extern const struct intel_execution_engine2 { (e__)->name; \ (e__)++) -enum drm_i915_gem_engine_class { - I915_ENGINE_CLASS_RENDER = 0, - I915_ENGINE_CLASS_COPY = 1, - I915_ENGINE_CLASS_VIDEO = 2, - I915_ENGINE_CLASS_VIDEO_ENHANCE = 3, - - I915_ENGINE_CLASS_INVALID = -1 -}; - unsigned int gem_class_instance_to_eb_flags(int gem_fd, enum drm_i915_gem_engine_class class, diff --git a/lib/meson.build b/lib/meson.build index d06d85b4..42da7185 100644 --- a/lib/meson.build +++ b/lib/meson.build @@ -181,7 +181,8 @@ lib_igt = declare_dependency(link_with : lib_igt_build, igt_deps = [ lib_igt ] + lib_deps lib_igt_perf_build = static_library('igt_perf', - ['igt_perf.c'] + ['igt_perf.c'], + include_directories : inc ) lib_igt_perf = declare_dependency(link_with : lib_igt_perf_build, -- cgit v1.2.3