[Intel-gfx] [PATCH 18/28] lib: unnecessary header removal for drmtest.h, part 2

Daniel Vetter daniel.vetter at ffwll.ch
Sun Mar 23 15:18:52 CET 2014 

I've left unistd.h in it - it's not strictly required but most users
of drmtest.h want it for the open helpers, and then you kinda need to
close that file descriptor again ...

Signed-off-by: Daniel Vetter <daniel.vetter at ffwll.ch>
---
 benchmarks/intel_upload_blit_large.c | 6 ++++--
 lib/drmtest.h                        | 9 +++------
 lib/igt_core.c                       | 2 +-
 lib/igt_core.h                       | 2 ++
 lib/igt_debugfs.c                    | 1 +
 lib/igt_kms.c                        | 6 +++++-
 lib/igt_kms.h                        | 2 ++
 lib/ioctl_wrappers.c                 | 1 +
 tests/core_getclient.c               | 3 +++
 tests/core_getstats.c                | 5 +++++
 tests/gem_ctx_bad_destroy.c          | 2 ++
 tests/gem_ctx_create.c               | 2 ++
 tests/gem_fenced_exec_thrash.c       | 4 +++-
 tests/gem_flink_race.c               | 1 +
 tests/gem_reg_read.c                 | 2 ++
 tests/gem_seqno_wrap.c               | 1 +
 tests/gem_vmap_blits.c               | 1 +
 tests/igt_simulation.c               | 1 +
 tests/pm_psr.c                       | 2 ++
 tests/pm_rc6_residency.c             | 2 ++
 tests/pm_rps.c                       | 1 +
 tests/prime_udl.c                    | 3 ++-
 22 files changed, 47 insertions(+), 12 deletions(-)

diff --git a/benchmarks/intel_upload_blit_large.c b/benchmarks/intel_upload_blit_large.c
index b44433f9a30d..40bdbcfb8fe3 100644
--- a/benchmarks/intel_upload_blit_large.c
+++ b/benchmarks/intel_upload_blit_large.c
@@ -53,8 +53,10 @@
 #include <errno.h>
 #include <sys/stat.h>
 #include <sys/time.h>
-#include "drm.h"
-#include "i915_drm.h"
+
+#include <drm.h>
+#include <i915_drm.h>
+
 #include "drmtest.h"
 #include "intel_bufmgr.h"
 #include "intel_batchbuffer.h"
diff --git a/lib/drmtest.h b/lib/drmtest.h
index 4c55068ee54c..97d60d0c29dd 100644
--- a/lib/drmtest.h
+++ b/lib/drmtest.h
@@ -28,16 +28,13 @@
 #ifndef DRMTEST_H
 #define DRMTEST_H
 
-#include <stdio.h>
-#include <stdlib.h>
 #include <unistd.h>
-#include <errno.h>
 #include <stdbool.h>
+#include <stdint.h>
 #include <sys/mman.h>
 
-#include "xf86drm.h"
-#include "xf86drmMode.h"
-#include "intel_batchbuffer.h"
+#include <xf86drm.h>
+#include <intel_batchbuffer.h>
 
 #ifdef ANDROID
 #ifndef HAVE_MMAP64
diff --git a/lib/igt_core.c b/lib/igt_core.c
index efcc4a11fcc5..81e37313fb45 100644
--- a/lib/igt_core.c
+++ b/lib/igt_core.c
@@ -48,9 +48,9 @@
 #include <sys/syscall.h>
 #include <sys/utsname.h>
 #include <termios.h>
+#include <errno.h>
 
 #include "drmtest.h"
-#include "i915_drm.h"
 #include "intel_chipset.h"
 #include "intel_gpu_tools.h"
 #include "igt_debugfs.h"
diff --git a/lib/igt_core.h b/lib/igt_core.h
index 47576da652a0..7ede0d37a540 100644
--- a/lib/igt_core.h
+++ b/lib/igt_core.h
@@ -32,8 +32,10 @@
 
 #include <setjmp.h>
 #include <stdbool.h>
+#include <stdlib.h>
 #include <string.h>
 #include <sys/types.h>
+#include <stdarg.h>
 
 bool __igt_fixture(void);
 void __igt_fixture_complete(void);
diff --git a/lib/igt_debugfs.c b/lib/igt_debugfs.c
index f467ce0f3992..96adf396887b 100644
--- a/lib/igt_debugfs.c
+++ b/lib/igt_debugfs.c
@@ -27,6 +27,7 @@
 #include <sys/mount.h>
 #include <errno.h>
 #include <stdio.h>
+#include <stdlib.h>
 #include <string.h>
 #include <fcntl.h>
 #include <unistd.h>
diff --git a/lib/igt_kms.c b/lib/igt_kms.c
index 88ee83be2f91..f74f7070d040 100644
--- a/lib/igt_kms.c
+++ b/lib/igt_kms.c
@@ -23,14 +23,18 @@
  */
 
 #define _GNU_SOURCE
+#include <unistd.h>
 #include <stdio.h>
 #include <stdarg.h>
 #include <fcntl.h>
 #include <sys/stat.h>
 #include <string.h>
+#include <stdlib.h>
 #include <math.h>
 #include <linux/kd.h>
-#include "drm_fourcc.h"
+#include <errno.h>
+
+#include <drm_fourcc.h>
 
 #include "drmtest.h"
 #include "igt_kms.h"
diff --git a/lib/igt_kms.h b/lib/igt_kms.h
index d141cfce8504..95735e8ffdd7 100644
--- a/lib/igt_kms.h
+++ b/lib/igt_kms.h
@@ -29,6 +29,8 @@
 #include <stdint.h>
 #include <cairo.h>
 
+#include <xf86drmMode.h>
+
 #include "igt_display.h"
 
 struct kmstest_connector_config {
diff --git a/lib/ioctl_wrappers.c b/lib/ioctl_wrappers.c
index 147334f3286b..5806f2a13bd8 100644
--- a/lib/ioctl_wrappers.c
+++ b/lib/ioctl_wrappers.c
@@ -47,6 +47,7 @@
 #include <sys/syscall.h>
 #include <sys/utsname.h>
 #include <termios.h>
+#include <errno.h>
 
 #include "drmtest.h"
 #include "i915_drm.h"
diff --git a/tests/core_getclient.c b/tests/core_getclient.c
index 22f0ab2e2b69..ed46e51924ea 100644
--- a/tests/core_getclient.c
+++ b/tests/core_getclient.c
@@ -27,6 +27,9 @@
 
 #include <limits.h>
 #include <sys/ioctl.h>
+#include <stdlib.h>
+#include <errno.h>
+
 #include "drmtest.h"
 
 /**
diff --git a/tests/core_getstats.c b/tests/core_getstats.c
index cce8271b561d..1e2c5651d5eb 100644
--- a/tests/core_getstats.c
+++ b/tests/core_getstats.c
@@ -27,6 +27,11 @@
 
 #include <limits.h>
 #include <sys/ioctl.h>
+#include <sys/types.h>
+
+#include <drm.h>
+
+#include "igt_core.h"
 #include "drmtest.h"
 
 /**
diff --git a/tests/gem_ctx_bad_destroy.c b/tests/gem_ctx_bad_destroy.c
index 092f34221061..97a706660dc1 100644
--- a/tests/gem_ctx_bad_destroy.c
+++ b/tests/gem_ctx_bad_destroy.c
@@ -31,6 +31,8 @@
 
 #include <stdio.h>
 #include <string.h>
+#include <errno.h>
+
 #include "ioctl_wrappers.h"
 #include "drmtest.h"
 
diff --git a/tests/gem_ctx_create.c b/tests/gem_ctx_create.c
index f32c2287f8d9..57494fc44638 100644
--- a/tests/gem_ctx_create.c
+++ b/tests/gem_ctx_create.c
@@ -27,6 +27,8 @@
 
 #include <stdio.h>
 #include <string.h>
+#include <errno.h>
+
 #include "ioctl_wrappers.h"
 #include "drmtest.h"
 
diff --git a/tests/gem_fenced_exec_thrash.c b/tests/gem_fenced_exec_thrash.c
index cd53cafc5fdf..2ba85f2bcb5a 100644
--- a/tests/gem_fenced_exec_thrash.c
+++ b/tests/gem_fenced_exec_thrash.c
@@ -33,9 +33,11 @@
 #include <string.h>
 #include <fcntl.h>
 #include <inttypes.h>
+#include <errno.h>
+
 #include <drm.h>
-#include "ioctl_wrappers.h"
 
+#include "ioctl_wrappers.h"
 #include "drmtest.h"
 #include "intel_chipset.h"
 #include "intel_gpu_tools.h"
diff --git a/tests/gem_flink_race.c b/tests/gem_flink_race.c
index 26c71cecce07..3353b83e6acd 100644
--- a/tests/gem_flink_race.c
+++ b/tests/gem_flink_race.c
@@ -31,6 +31,7 @@
 #include <fcntl.h>
 #include <unistd.h>
 #include <pthread.h>
+#include <errno.h>
 
 #include "drmtest.h"
 #include "ioctl_wrappers.h"
diff --git a/tests/gem_reg_read.c b/tests/gem_reg_read.c
index 19f1351b3fd1..b4a6650a64d4 100644
--- a/tests/gem_reg_read.c
+++ b/tests/gem_reg_read.c
@@ -27,6 +27,8 @@
 
 #include <stdio.h>
 #include <string.h>
+#include <errno.h>
+
 #include "ioctl_wrappers.h"
 #include "drmtest.h"
 
diff --git a/tests/gem_seqno_wrap.c b/tests/gem_seqno_wrap.c
index 19c0201e21ba..30d1a8687090 100644
--- a/tests/gem_seqno_wrap.c
+++ b/tests/gem_seqno_wrap.c
@@ -41,6 +41,7 @@
 #include <wordexp.h>
 #include <getopt.h>
 #include <signal.h>
+#include <errno.h>
 
 #include "ioctl_wrappers.h"
 #include "drmtest.h"
diff --git a/tests/gem_vmap_blits.c b/tests/gem_vmap_blits.c
index 4fb2a215e3d5..157d67460e6c 100644
--- a/tests/gem_vmap_blits.c
+++ b/tests/gem_vmap_blits.c
@@ -43,6 +43,7 @@
 #include <errno.h>
 #include <sys/stat.h>
 #include <sys/time.h>
+
 #include "drm.h"
 #include "ioctl_wrappers.h"
 #include "drmtest.h"
diff --git a/tests/igt_simulation.c b/tests/igt_simulation.c
index f4007b80929e..d3331176cf2c 100644
--- a/tests/igt_simulation.c
+++ b/tests/igt_simulation.c
@@ -29,6 +29,7 @@
 #include <sys/wait.h>
 #include <sys/types.h>
 #include <assert.h>
+#include <errno.h>
 
 #include "drmtest.h"
 #include "igt_core.h"
diff --git a/tests/pm_psr.c b/tests/pm_psr.c
index 5d28c7a59a3b..4ba121f10a38 100644
--- a/tests/pm_psr.c
+++ b/tests/pm_psr.c
@@ -29,6 +29,8 @@
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
+#include <errno.h>
+
 #include "drmtest.h"
 
 #define SLEEP_DURATION 5000 // in milliseconds
diff --git a/tests/pm_rc6_residency.c b/tests/pm_rc6_residency.c
index 3fd9d47e9db3..84eb8a909019 100644
--- a/tests/pm_rc6_residency.c
+++ b/tests/pm_rc6_residency.c
@@ -30,6 +30,8 @@
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
+#include <errno.h>
+
 #include "drmtest.h"
 
 #define SLEEP_DURATION 3000 // in milliseconds
diff --git a/tests/pm_rps.c b/tests/pm_rps.c
index e6ab37907e8e..1f4b284cd42a 100644
--- a/tests/pm_rps.c
+++ b/tests/pm_rps.c
@@ -34,6 +34,7 @@
 #include <getopt.h>
 #include <fcntl.h>
 #include <signal.h>
+#include <errno.h>
 
 #include "drmtest.h"
 #include "intel_gpu_tools.h"
diff --git a/tests/prime_udl.c b/tests/prime_udl.c
index 892a952795a7..96661fcb501f 100644
--- a/tests/prime_udl.c
+++ b/tests/prime_udl.c
@@ -24,7 +24,8 @@
 #include <errno.h>
 
 #include "xf86drm.h"
-#include "xf86drmMode.h"
+#include <xf86drmMode.h>
+
 #include "ioctl_wrappers.h"
 #include "intel_bufmgr.h"
 #include "intel_gpu_tools.h"
-- 
1.8.5.2

More information about the Intel-gfx mailing list