lib: remove uncessary #includes from headers

Only include what the header itself needs. The big fish here is
intel-gpu-tools.h. More will follow.

One ugly thing removed here is the duplicated GEN6_TD_CTL #define, one
of which was broken.

Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>

26 files changed, 36 insertions, 0 deletions

diff --git a/tools/intel_audio_dump.c b/tools/intel_audio_dump.c
index 3ed29180..9762b4f7 100644
--- a/tools/intel_audio_dump.c
+++ b/tools/intel_audio_dump.c
@@ -34,6 +34,9 @@
 #include <err.h>
 #include <arpa/inet.h>
 #include "intel_gpu_tools.h"
+#include "intel_reg.h"
+#include "intel_chipset.h"
+#include "drmtest.h"
 
 static uint32_t devid;
 
diff --git a/tools/intel_backlight.c b/tools/intel_backlight.c
index bd7c813b..e2591847 100644
--- a/tools/intel_backlight.c
+++ b/tools/intel_backlight.c
@@ -31,6 +31,8 @@
 #include <string.h>
 
 #include "intel_gpu_tools.h"
+#include "intel_chipset.h"
+#include "intel_reg.h"
 
 /* XXX PCH only today */
 
diff --git a/tools/intel_bios_reader.c b/tools/intel_bios_reader.c
index 19b0fd92..8eb46f3d 100644
--- a/tools/intel_bios_reader.c
+++ b/tools/intel_bios_reader.c
@@ -37,6 +37,8 @@
 
 #include "intel_bios.h"
 #include "intel_gpu_tools.h"
+#include "intel_chipset.h"
+#include "drmtest.h"
 
 static uint32_t devid = -1;
 
diff --git a/tools/intel_dpio_read.c b/tools/intel_dpio_read.c
index 85f8a18d..2196041a 100644
--- a/tools/intel_dpio_read.c
+++ b/tools/intel_dpio_read.c
@@ -31,6 +31,7 @@
 #include <err.h>
 #include <string.h>
 #include "intel_gpu_tools.h"
+#include "intel_chipset.h"
 
 static void usage(char *cmdname)
 {
diff --git a/tools/intel_dpio_write.c b/tools/intel_dpio_write.c
index e09f9947..c3c682a6 100644
--- a/tools/intel_dpio_write.c
+++ b/tools/intel_dpio_write.c
@@ -31,6 +31,7 @@
 #include <err.h>
 #include <string.h>
 #include "intel_gpu_tools.h"
+#include "intel_chipset.h"
 
 static void usage(char *cmdname)
 {
diff --git a/tools/intel_error_decode.c b/tools/intel_error_decode.c
index fff2aed5..b1d51b74 100644
--- a/tools/intel_error_decode.c
+++ b/tools/intel_error_decode.c
@@ -55,6 +55,7 @@
 #include "intel_chipset.h"
 #include "intel_gpu_tools.h"
 #include "instdone.h"
+#include "intel_reg.h"
 
 static uint32_t
 print_head(unsigned int reg)
diff --git a/tools/intel_forcewaked.c b/tools/intel_forcewaked.c
index a90e73e0..b4e7b5cc 100644
--- a/tools/intel_forcewaked.c
+++ b/tools/intel_forcewaked.c
@@ -35,6 +35,7 @@
 #include <syslog.h>
 #include <unistd.h>
 #include "intel_gpu_tools.h"
+#include "intel_chipset.h"
 
 bool daemonized;
 
diff --git a/tools/intel_gpu_time.c b/tools/intel_gpu_time.c
index c30b84d2..0b8ca9e4 100644
--- a/tools/intel_gpu_time.c
+++ b/tools/intel_gpu_time.c
@@ -35,6 +35,8 @@
 #include <sys/wait.h>
 
 #include "intel_gpu_tools.h"
+#include "intel_chipset.h"
+#include "intel_reg.h"
 
 #define SAMPLES_PER_SEC             10000
 
diff --git a/tools/intel_gpu_top.c b/tools/intel_gpu_top.c
index 31e080a7..ccbe9736 100644
--- a/tools/intel_gpu_top.c
+++ b/tools/intel_gpu_top.c
@@ -44,6 +44,8 @@
 #endif
 #include "intel_gpu_tools.h"
 #include "instdone.h"
+#include "intel_reg.h"
+#include "intel_chipset.h"
 
 #define  FORCEWAKE	    0xA18C
 #define  FORCEWAKE_ACK	    0x130090
diff --git a/tools/intel_gtt.c b/tools/intel_gtt.c
index a21c26a7..f3d1c308 100644
--- a/tools/intel_gtt.c
+++ b/tools/intel_gtt.c
@@ -35,6 +35,7 @@
 #include <unistd.h>
 
 #include "intel_gpu_tools.h"
+#include "intel_chipset.h"
 
 #define KB(x) ((x) * 1024)
 #define MB(x) ((x) * 1024 * 1024)
diff --git a/tools/intel_infoframes.c b/tools/intel_infoframes.c
index 81e03433..76dd6271 100644
--- a/tools/intel_infoframes.c
+++ b/tools/intel_infoframes.c
@@ -31,6 +31,8 @@
 #include <string.h>
 #include <getopt.h>
 #include "intel_gpu_tools.h"
+#include "intel_chipset.h"
+#include "drmtest.h"
 
 typedef enum {
 	TRANSC_A = 0,
diff --git a/tools/intel_lid.c b/tools/intel_lid.c
index 51a95fee..34960461 100644
--- a/tools/intel_lid.c
+++ b/tools/intel_lid.c
@@ -40,6 +40,7 @@
 #include "intel_gpu_tools.h"
 #include "intel_reg.h"
 #include "intel_bios.h"
+#include "intel_chipset.h"
 
 enum lid_status {
 	LID_UNKNOWN = -1,
diff --git a/tools/intel_nc_read.c b/tools/intel_nc_read.c
index a2c2e9f7..0ec3e757 100644
--- a/tools/intel_nc_read.c
+++ b/tools/intel_nc_read.c
@@ -31,6 +31,7 @@
 #include <err.h>
 #include <string.h>
 #include "intel_gpu_tools.h"
+#include "intel_chipset.h"
 
 static void usage(char *cmdname)
 {
diff --git a/tools/intel_nc_write.c b/tools/intel_nc_write.c
index 58be79a6..5700f67f 100644
--- a/tools/intel_nc_write.c
+++ b/tools/intel_nc_write.c
@@ -31,6 +31,7 @@
 #include <err.h>
 #include <string.h>
 #include "intel_gpu_tools.h"
+#include "intel_chipset.h"
 
 static void usage(char *cmdname)
 {
diff --git a/tools/intel_opregion_decode.c b/tools/intel_opregion_decode.c
index 8a9ef209..0beece69 100644
--- a/tools/intel_opregion_decode.c
+++ b/tools/intel_opregion_decode.c
@@ -38,6 +38,7 @@
 #include <sys/types.h>
 
 #include "intel_gpu_tools.h"
+#include "drmtest.h"
 
 #define OPREGION_HEADER_OFFSET		0
 #define OPREGION_ACPI_OFFSET		0x100
diff --git a/tools/intel_panel_fitter.c b/tools/intel_panel_fitter.c
index f6723d17..2e3f6883 100644
--- a/tools/intel_panel_fitter.c
+++ b/tools/intel_panel_fitter.c
@@ -31,6 +31,8 @@
 #include <stdlib.h>
 #include <string.h>
 #include "intel_gpu_tools.h"
+#include "intel_chipset.h"
+#include "intel_reg.h"
 
 int gen;
 
diff --git a/tools/intel_punit_read.c b/tools/intel_punit_read.c
index 3fa2ca8c..187bd77c 100644
--- a/tools/intel_punit_read.c
+++ b/tools/intel_punit_read.c
@@ -31,6 +31,7 @@
 #include <err.h>
 #include <string.h>
 #include "intel_gpu_tools.h"
+#include "intel_chipset.h"
 
 static void usage(char *cmdname)
 {
diff --git a/tools/intel_punit_write.c b/tools/intel_punit_write.c
index eb036ba9..c0aa0853 100644
--- a/tools/intel_punit_write.c
+++ b/tools/intel_punit_write.c
@@ -31,6 +31,7 @@
 #include <err.h>
 #include <string.h>
 #include "intel_gpu_tools.h"
+#include "intel_chipset.h"
 
 static void usage(char *cmdname)
 {
diff --git a/tools/intel_reg_checker.c b/tools/intel_reg_checker.c
index daa8d0fb..a2c76419 100644
--- a/tools/intel_reg_checker.c
+++ b/tools/intel_reg_checker.c
@@ -27,6 +27,7 @@
 #include <string.h>
 #include <stdbool.h>
 #include "intel_gpu_tools.h"
+#include "intel_chipset.h"
 
 static uint32_t devid;
 static int gen;
diff --git a/tools/intel_reg_dumper.c b/tools/intel_reg_dumper.c
index 65fe41eb..432892ae 100644
--- a/tools/intel_reg_dumper.c
+++ b/tools/intel_reg_dumper.c
@@ -34,6 +34,9 @@
 #include <err.h>
 #include <unistd.h>
 #include "intel_gpu_tools.h"
+#include "intel_chipset.h"
+#include "intel_reg.h"
+#include "drmtest.h"
 
 static uint32_t devid = 0;
 
diff --git a/tools/intel_reg_read.c b/tools/intel_reg_read.c
index ae631be0..961248a0 100644
--- a/tools/intel_reg_read.c
+++ b/tools/intel_reg_read.c
@@ -31,6 +31,7 @@
 #include <err.h>
 #include <string.h>
 #include "intel_gpu_tools.h"
+#include "intel_chipset.h"
 
 static void bit_decode(uint32_t reg)
 {
diff --git a/tools/intel_reg_snapshot.c b/tools/intel_reg_snapshot.c
index 9c5fa839..09a95b39 100644
--- a/tools/intel_reg_snapshot.c
+++ b/tools/intel_reg_snapshot.c
@@ -27,6 +27,7 @@
 #include <unistd.h>
 #include <assert.h>
 #include "intel_gpu_tools.h"
+#include "intel_chipset.h"
 
 int main(int argc, char** argv)
 {
diff --git a/tools/intel_reg_write.c b/tools/intel_reg_write.c
index dd636f65..0f73a770 100644
--- a/tools/intel_reg_write.c
+++ b/tools/intel_reg_write.c
@@ -30,6 +30,7 @@
 #include <stdio.h>
 #include <err.h>
 #include "intel_gpu_tools.h"
+#include "intel_chipset.h"
 
 int main(int argc, char** argv)
 {
diff --git a/tools/intel_stepping.c b/tools/intel_stepping.c
index f6f15d1a..626c5bbb 100644
--- a/tools/intel_stepping.c
+++ b/tools/intel_stepping.c
@@ -33,6 +33,7 @@
 #include <err.h>
 #include "intel_chipset.h"
 #include "intel_gpu_tools.h"
+#include "intel_reg.h"
 
 static void
 print_clock(const char *name, int clock) {
diff --git a/tools/intel_vga_read.c b/tools/intel_vga_read.c
index 7d868195..40a9cdc8 100644
--- a/tools/intel_vga_read.c
+++ b/tools/intel_vga_read.c
@@ -32,6 +32,7 @@
 #include <unistd.h>
 #include <sys/io.h>
 #include "intel_gpu_tools.h"
+#include "intel_chipset.h"
 
 static uint8_t read_reg(uint32_t reg, bool use_mmio)
 {
diff --git a/tools/intel_vga_write.c b/tools/intel_vga_write.c
index effca462..91af0fe5 100644
--- a/tools/intel_vga_write.c
+++ b/tools/intel_vga_write.c
@@ -32,6 +32,7 @@
 #include <unistd.h>
 #include <sys/io.h>
 #include "intel_gpu_tools.h"
+#include "intel_chipset.h"
 
 static void write_reg(uint32_t reg, uint8_t val, bool use_mmio)
 {