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]>

6 files changed, 6 insertions, 6 deletions

diff --git a/src/gallium/winsys/i915/drm/i915_drm_batchbuffer.c b/src/gallium/winsys/i915/drm/i915_drm_batchbuffer.c
index 93ce6f224fe..62dc890eb13 100644
--- a/src/gallium/winsys/i915/drm/i915_drm_batchbuffer.c
+++ b/src/gallium/winsys/i915/drm/i915_drm_batchbuffer.c
@@ -2,7 +2,7 @@
 #include "i915_drm_winsys.h"
 #include "util/u_memory.h"
 
-#include "i915_drm.h"
+#include "drm-uapi/i915_drm.h"
 #include "i915/i915_debug.h"
 #include <xf86drm.h>
 #include <stdio.h>
diff --git a/src/gallium/winsys/i915/drm/i915_drm_buffer.c b/src/gallium/winsys/i915/drm/i915_drm_buffer.c
index 509984ac6ac..9b525f9809c 100644
--- a/src/gallium/winsys/i915/drm/i915_drm_buffer.c
+++ b/src/gallium/winsys/i915/drm/i915_drm_buffer.c
@@ -2,7 +2,7 @@
 #include "i915_drm_winsys.h"
 #include "util/u_memory.h"
 
-#include "i915_drm.h"
+#include "drm-uapi/i915_drm.h"
 
 static char *i915_drm_type_to_name(enum i915_winsys_buffer_type type)
 {
diff --git a/src/gallium/winsys/i915/drm/i915_drm_winsys.c b/src/gallium/winsys/i915/drm/i915_drm_winsys.c
index d4a2e013ae6..d07ee496e48 100644
--- a/src/gallium/winsys/i915/drm/i915_drm_winsys.c
+++ b/src/gallium/winsys/i915/drm/i915_drm_winsys.c
@@ -1,7 +1,7 @@
 #include <stdio.h>
 #include <sys/ioctl.h>
 
-#include "i915_drm.h"
+#include "drm-uapi/i915_drm.h"
 
 #include "state_tracker/drm_driver.h"
 
diff --git a/src/gallium/winsys/i915/drm/i915_drm_winsys.h b/src/gallium/winsys/i915/drm/i915_drm_winsys.h
index 56b9e150497..d02e3c278ab 100644
--- a/src/gallium/winsys/i915/drm/i915_drm_winsys.h
+++ b/src/gallium/winsys/i915/drm/i915_drm_winsys.h
@@ -4,7 +4,7 @@
 
 #include "i915/i915_batchbuffer.h"
 
-#include "drm.h"
+#include "drm-uapi/drm.h"
 #include "intel_bufmgr.h"
 
 
diff --git a/src/gallium/winsys/svga/drm/vmwgfx_drm.h b/src/gallium/winsys/svga/drm/vmwgfx_drm.h
index 20fbcd727c1..0b1e031292e 100644
--- a/src/gallium/winsys/svga/drm/vmwgfx_drm.h
+++ b/src/gallium/winsys/svga/drm/vmwgfx_drm.h
@@ -29,7 +29,7 @@
 #define __VMWGFX_DRM_H__
 
 #ifndef __KERNEL__
-#include <drm.h>
+#include "drm-uapi/drm.h"
 #endif
 
 #define DRM_VMW_MAX_SURFACE_FACES 6
diff --git a/src/gallium/winsys/virgl/drm/virtgpu_drm.h b/src/gallium/winsys/virgl/drm/virtgpu_drm.h
index 4be22aa077c..b01a4cd2f51 100644
--- a/src/gallium/winsys/virgl/drm/virtgpu_drm.h
+++ b/src/gallium/winsys/virgl/drm/virtgpu_drm.h
@@ -25,7 +25,7 @@
 #define VIRTGPU_DRM_H
 
 #include <stddef.h>
-#include "drm.h"
+#include "drm-uapi/drm.h"
 
 /* Please note that modifications to all structs defined here are
  * subject to backwards-compatibility constraints.