From: Jordan Justen Date: Sun, 24 Feb 2019 22:21:39 +0000 (-0800) Subject: iris: Always use in-tree i915_drm.h X-Git-Tag: android-x86-9.0-r1~8854 X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=bd0ad651e0e99898ef46cb9b73e37de9f6904cb4;p=android-x86%2Fexternal-mesa.git iris: Always use in-tree i915_drm.h Ref: f1374805a86 "drm-uapi: use local files, not system libdrm" Signed-off-by: Jordan Justen Reviewed-by: Caio Marcelo de Oliveira Filho Reviewed-by: Sagar Ghuge Reviewed-by: Kenneth Graunke --- diff --git a/src/gallium/drivers/iris/iris_batch.h b/src/gallium/drivers/iris/iris_batch.h index 3dd33663f11..fc8c588f800 100644 --- a/src/gallium/drivers/iris/iris_batch.h +++ b/src/gallium/drivers/iris/iris_batch.h @@ -30,7 +30,7 @@ #include "util/u_dynarray.h" -#include "i915_drm.h" +#include "drm-uapi/i915_drm.h" #include "common/gen_decoder.h" #include "iris_fence.h" diff --git a/src/gallium/drivers/iris/iris_context.c b/src/gallium/drivers/iris/iris_context.c index 420f663ce5a..60bf8a53720 100644 --- a/src/gallium/drivers/iris/iris_context.c +++ b/src/gallium/drivers/iris/iris_context.c @@ -28,7 +28,7 @@ #include "util/u_inlines.h" #include "util/u_format.h" #include "util/u_upload_mgr.h" -#include "i915_drm.h" +#include "drm-uapi/i915_drm.h" #include "iris_context.h" #include "iris_resource.h" #include "iris_screen.h" diff --git a/src/gallium/drivers/iris/iris_state.c b/src/gallium/drivers/iris/iris_state.c index 45d90e42515..578a61292e5 100644 --- a/src/gallium/drivers/iris/iris_state.c +++ b/src/gallium/drivers/iris/iris_state.c @@ -94,7 +94,7 @@ #include "util/u_transfer.h" #include "util/u_upload_mgr.h" #include "util/u_viewport.h" -#include "i915_drm.h" +#include "drm-uapi/i915_drm.h" #include "nir.h" #include "intel/compiler/brw_compiler.h" #include "intel/common/gen_l3_config.h"