[Intel-gfx] [PATCH 16/28] lib: more unecessary header removal

[Daniel Vetter]

This time big with media_fill.h

Signed-off-by: Daniel Vetter <daniel.vetter at ffwll.ch>
---
 lib/igt_core.h             |  3 +++
 lib/igt_kms.h              |  1 -
 lib/intel_batchbuffer.h    |  2 +-
 lib/media_fill.h           | 16 +---------------
 lib/media_fill_gen7.c      |  3 +++
 lib/media_fill_gen8.c      |  3 +++
 tests/kms_cursor_crc.c     |  1 +
 tests/kms_pipe_crc_basic.c |  1 +
 tests/kms_plane.c          |  1 +
 9 files changed, 14 insertions(+), 17 deletions(-)

diff --git a/lib/igt_core.h b/lib/igt_core.h
index c21448e70add..47576da652a0 100644
--- a/lib/igt_core.h
+++ b/lib/igt_core.h
@@ -30,7 +30,10 @@
 #ifndef IGT_CORE_H
 #define IGT_CORE_H
 
+#include <setjmp.h>
 #include <stdbool.h>
+#include <string.h>
+#include <sys/types.h>
 
 bool __igt_fixture(void);
 void __igt_fixture_complete(void);
diff --git a/lib/igt_kms.h b/lib/igt_kms.h
index 6590fd58dd15..d141cfce8504 100644
--- a/lib/igt_kms.h
+++ b/lib/igt_kms.h
@@ -27,7 +27,6 @@
 
 #include <stdbool.h>
 #include <stdint.h>
-#include <drm_fourcc.h>
 #include <cairo.h>
 
 #include "igt_display.h"
diff --git a/lib/intel_batchbuffer.h b/lib/intel_batchbuffer.h
index 244bdbda195d..e11281a3248a 100644
--- a/lib/intel_batchbuffer.h
+++ b/lib/intel_batchbuffer.h
@@ -2,7 +2,7 @@
 #define INTEL_BATCHBUFFER_H
 
 #include <stdint.h>
-#include "intel_bufmgr.h"
+#include <intel_bufmgr.h>
 #include "igt_core.h"
 #include "intel_reg.h"
 
diff --git a/lib/media_fill.h b/lib/media_fill.h
index 3568cf603955..d417c75a6cdd 100644
--- a/lib/media_fill.h
+++ b/lib/media_fill.h
@@ -1,22 +1,8 @@
 #ifndef RENDE_MEDIA_FILL_H
 #define RENDE_MEDIA_FILL_H
 
-#include <stdlib.h>
-#include <sys/ioctl.h>
-#include <stdio.h>
-#include <string.h>
-#include <fcntl.h>
-#include <inttypes.h>
-#include <errno.h>
-#include <sys/stat.h>
-#include <sys/time.h>
-#include <getopt.h>
-#include "drm.h"
-#include "i915_drm.h"
-#include "drmtest.h"
-#include "intel_bufmgr.h"
+#include <stdint.h>
 #include "intel_batchbuffer.h"
-#include "intel_gpu_tools.h"
 
 void
 gen8_media_fillfunc(struct intel_batchbuffer *batch,
diff --git a/lib/media_fill_gen7.c b/lib/media_fill_gen7.c
index 7494d44d1536..cdf4b60361e7 100644
--- a/lib/media_fill_gen7.c
+++ b/lib/media_fill_gen7.c
@@ -1,3 +1,6 @@
+#include <intel_bufmgr.h>
+#include <i915_drm.h>
+
 #include "media_fill.h"
 #include "gen7_media.h"
 #include "intel_reg.h"
diff --git a/lib/media_fill_gen8.c b/lib/media_fill_gen8.c
index d65d26085b20..996d4d02a14e 100644
--- a/lib/media_fill_gen8.c
+++ b/lib/media_fill_gen8.c
@@ -1,3 +1,6 @@
+#include <intel_bufmgr.h>
+#include <i915_drm.h>
+
 #include "media_fill.h"
 #include "gen8_media.h"
 #include "intel_reg.h"
diff --git a/tests/kms_cursor_crc.c b/tests/kms_cursor_crc.c
index f95448f47356..f87fe0ba9054 100644
--- a/tests/kms_cursor_crc.c
+++ b/tests/kms_cursor_crc.c
@@ -27,6 +27,7 @@
 #include <stdbool.h>
 #include <stdio.h>
 #include <string.h>
+#include <drm_fourcc.h>
 
 #include "drmtest.h"
 #include "igt_debugfs.h"
diff --git a/tests/kms_pipe_crc_basic.c b/tests/kms_pipe_crc_basic.c
index 75217df4f5e1..ef3ab4083eb6 100644
--- a/tests/kms_pipe_crc_basic.c
+++ b/tests/kms_pipe_crc_basic.c
@@ -26,6 +26,7 @@
 #include <stdbool.h>
 #include <stdio.h>
 #include <string.h>
+#include <drm_fourcc.h>
 
 #include "drmtest.h"
 #include "igt_debugfs.h"
diff --git a/tests/kms_plane.c b/tests/kms_plane.c
index 223f0a772021..83d45c546322 100644
--- a/tests/kms_plane.c
+++ b/tests/kms_plane.c
@@ -28,6 +28,7 @@
 #include <stdbool.h>
 #include <stdio.h>
 #include <string.h>
+#include <drm_fourcc.h>
 
 #include "drmtest.h"
 #include "igt_debugfs.h"
-- 
1.8.5.2