From: Daniel Vetter <daniel.vetter@ffwll.ch>
To: Intel Graphics Development <intel-gfx@lists.freedesktop.org>
Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
Subject: [PATCH 16/28] lib: more unecessary header removal
Date: Sun, 23 Mar 2014 15:18:50 +0100 [thread overview]
Message-ID: <1395584342-11812-17-git-send-email-daniel.vetter@ffwll.ch> (raw)
In-Reply-To: <1395584342-11812-1-git-send-email-daniel.vetter@ffwll.ch>
This time big with media_fill.h
Signed-off-by: Daniel Vetter <daniel.vetter@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
next prev parent reply other threads:[~2014-03-23 14:19 UTC|newest]
Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-03-23 14:18 [PATCH 00/28] more i-g-t docs and api polish Daniel Vetter
2014-03-23 14:18 ` [PATCH 01/28] lib: rename intel_pci.c to intel_chipset.c Daniel Vetter
2014-03-23 14:18 ` [PATCH 02/28] lib: consolidate chipset helpers in intel_chipset.[hc] Daniel Vetter
2014-03-23 14:18 ` [PATCH 03/28] lib/intel_chipset: intel_ prefix for pch global Daniel Vetter
2014-03-23 14:18 ` [PATCH 04/28] lib/intel_chipset: api docs Daniel Vetter
2014-03-23 14:18 ` [PATCH 05/28] lib: make rendercopy.h an internal header Daniel Vetter
2014-03-23 14:18 ` [PATCH 06/28] lib: make media_fill.h " Daniel Vetter
2014-03-23 14:18 ` [PATCH 07/28] lib/intel_batchbuffer: un-inline buf_height/width Daniel Vetter
2014-03-23 14:18 ` [PATCH 08/28] lib/intel_batchbuffer: igt_ namespace for the buffer structure Daniel Vetter
2014-03-23 14:18 ` [PATCH 09/28] lib/intel_batchbuffer: igt_ prefix for rendercopy/mediafill funcs Daniel Vetter
2014-03-23 14:18 ` [PATCH 10/28] lib/intel_batchbuffer: drop cpu_mapping from igt_buf Daniel Vetter
2014-03-23 14:18 ` [PATCH 11/28] lib/intel_batchbuffer: api documentation for render copy/media fill Daniel Vetter
2014-03-23 14:18 ` [PATCH 12/28] lib: Move non-register things out of intel-gpu-tools.h Daniel Vetter
2014-03-23 14:18 ` [PATCH 13/28] tests|lib: remove assert.h includes Daniel Vetter
2014-03-23 14:18 ` [PATCH 14/28] lib: add #include "foo.h" lines like in manpages Daniel Vetter
2014-03-23 14:18 ` [PATCH 15/28] lib: remove uncessary #includes from headers Daniel Vetter
2014-03-23 14:18 ` Daniel Vetter [this message]
2014-03-23 14:18 ` [PATCH 17/28] lib: unnecessary header removal for drmtest.h, part 1 Daniel Vetter
2014-03-23 14:18 ` [PATCH 18/28] lib: unnecessary header removal for drmtest.h, part 2 Daniel Vetter
2014-03-23 14:18 ` [PATCH 19/28] lib: rename intel_gpu_tools.h to intel_io.h Daniel Vetter
2014-03-23 14:18 ` [PATCH 20/28] lib/intel_io: rename mmio setup functions Daniel Vetter
2014-03-23 14:18 ` [PATCH 21/28] lib/intel_io: api documentation Daniel Vetter
2014-03-23 14:18 ` [PATCH 22/28] lib: s/drmtest_dumb_aub/igt_aub_dump_enabled/ Daniel Vetter
2014-03-23 14:18 ` [PATCH 23/28] lib: extract igt_aux.[hc] Daniel Vetter
2014-03-23 14:18 ` [PATCH 24/28] lib/igt_aux: api documentation Daniel Vetter
2014-03-23 14:18 ` [PATCH 25/28] lib: s/igt_env_set/igt_check_boolean_env_var Daniel Vetter
2014-03-23 14:19 ` [PATCH 26/28] lib: Use @include tag for include files Daniel Vetter
2014-03-23 14:19 ` [PATCH 27/28] lib/drmtest: api documentation Daniel Vetter
2014-03-23 14:19 ` [PATCH 28/28] lib/intel_batchbuffer: document header dependencies Daniel Vetter
2014-03-23 16:18 ` [PATCH 00/28] more i-g-t docs and api polish Daniel Vetter
2014-03-23 18:04 ` Ben Widawsky
2014-03-23 23:04 ` Daniel Vetter
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1395584342-11812-17-git-send-email-daniel.vetter@ffwll.ch \
--to=daniel.vetter@ffwll.ch \
--cc=intel-gfx@lists.freedesktop.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.