lib: rename intel_gpu_tools.h to intel_io.h

With the header cleanup we can now give this header a suitable name,
since it now really only contains register access and other I/O
functions and assorted definitions.

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

128 files changed, 127 insertions, 127 deletions

diff --git a/benchmarks/intel_upload_blit_large.c b/benchmarks/intel_upload_blit_large.c
index 40bdbcfb..e12a2b11 100644
--- a/benchmarks/intel_upload_blit_large.c
+++ b/benchmarks/intel_upload_blit_large.c
@@ -60,7 +60,7 @@
 #include "drmtest.h"
 #include "intel_bufmgr.h"
 #include "intel_batchbuffer.h"
-#include "intel_gpu_tools.h"
+#include "intel_io.h"
 #include "intel_chipset.h"
 
 #define OBJECT_WIDTH	1280
diff --git a/benchmarks/intel_upload_blit_large_gtt.c b/benchmarks/intel_upload_blit_large_gtt.c
index 49107102..c06c56c6 100644
--- a/benchmarks/intel_upload_blit_large_gtt.c
+++ b/benchmarks/intel_upload_blit_large_gtt.c
@@ -58,7 +58,7 @@
 #include "drmtest.h"
 #include "intel_bufmgr.h"
 #include "intel_batchbuffer.h"
-#include "intel_gpu_tools.h"
+#include "intel_io.h"
 #include "intel_chipset.h"
 
 #define OBJECT_WIDTH	1280
diff --git a/benchmarks/intel_upload_blit_large_map.c b/benchmarks/intel_upload_blit_large_map.c
index 93433fc9..18d2dfe4 100644
--- a/benchmarks/intel_upload_blit_large_map.c
+++ b/benchmarks/intel_upload_blit_large_map.c
@@ -61,7 +61,7 @@
 #include "drmtest.h"
 #include "intel_bufmgr.h"
 #include "intel_batchbuffer.h"
-#include "intel_gpu_tools.h"
+#include "intel_io.h"
 #include "intel_chipset.h"
 
 #define OBJECT_WIDTH	1280
diff --git a/benchmarks/intel_upload_blit_small.c b/benchmarks/intel_upload_blit_small.c
index e2f804bb..05590b13 100644
--- a/benchmarks/intel_upload_blit_small.c
+++ b/benchmarks/intel_upload_blit_small.c
@@ -54,7 +54,7 @@
 #include "drmtest.h"
 #include "intel_bufmgr.h"
 #include "intel_batchbuffer.h"
-#include "intel_gpu_tools.h"
+#include "intel_io.h"
 #include "intel_chipset.h"
 
 /* Happens to be 128k, the size of the VBOs used by i965's Mesa driver. */
diff --git a/debugger/debug_rdata.c b/debugger/debug_rdata.c
index fc7682b0..61d82d9e 100644
--- a/debugger/debug_rdata.c
+++ b/debugger/debug_rdata.c
@@ -28,7 +28,7 @@
 #include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include "intel_gpu_tools.h"
+#include "intel_io.h"
 #include "intel_chipset.h"
 
 struct eu_rdata {
diff --git a/debugger/eudb.c b/debugger/eudb.c
index 4cbc2d7b..0e810db1 100644
--- a/debugger/eudb.c
+++ b/debugger/eudb.c
@@ -44,7 +44,7 @@
 #include "drmtest.h"
 #include "intel_chipset.h"
 #include "intel_bufmgr.h"
-#include "intel_gpu_tools.h"
+#include "intel_io.h"
 #include "intel_batchbuffer.h"
 #include "intel_debug.h"
 #include "debug.h"
diff --git a/docs/reference/intel-gpu-tools/intel-gpu-tools-docs.xml b/docs/reference/intel-gpu-tools/intel-gpu-tools-docs.xml
index 0f117f71..bf196f27 100644
--- a/docs/reference/intel-gpu-tools/intel-gpu-tools-docs.xml
+++ b/docs/reference/intel-gpu-tools/intel-gpu-tools-docs.xml
@@ -23,7 +23,7 @@
     <xi:include href="xml/ioctl_wrappers.xml"/>
     <xi:include href="xml/intel_batchbuffer.xml"/>
     <xi:include href="xml/intel_chipset.xml"/>
-    <xi:include href="xml/intel_gpu_tools.xml"/>
+    <xi:include href="xml/intel_io.xml"/>
 
   </chapter>
   <index id="api-index-full">
diff --git a/lib/Makefile.sources b/lib/Makefile.sources
index e3942ace..3e2a4b5b 100644
--- a/lib/Makefile.sources
+++ b/lib/Makefile.sources
@@ -16,7 +16,7 @@ libintel_tools_la_SOURCES = 	\
 	intel_batchbuffer.h	\
 	intel_chipset.h		\
 	intel_os.c		\
-	intel_gpu_tools.h	\
+	intel_io.h		\
 	intel_mmio.c		\
 	intel_chipset.c		\
 	intel_reg.h		\
diff --git a/lib/drmtest.c b/lib/drmtest.c
index c6f7bdeb..3c72ac8d 100644
--- a/lib/drmtest.c
+++ b/lib/drmtest.c
@@ -51,7 +51,7 @@
 #include "drmtest.h"
 #include "i915_drm.h"
 #include "intel_chipset.h"
-#include "intel_gpu_tools.h"
+#include "intel_io.h"
 #include "igt_debugfs.h"
 #include "../version.h"
 #include "config.h"
diff --git a/lib/igt_core.c b/lib/igt_core.c
index 81e37313..cd094c43 100644
--- a/lib/igt_core.c
+++ b/lib/igt_core.c
@@ -52,7 +52,7 @@
 
 #include "drmtest.h"
 #include "intel_chipset.h"
-#include "intel_gpu_tools.h"
+#include "intel_io.h"
 #include "igt_debugfs.h"
 #include "../version.h"
 #include "config.h"
diff --git a/lib/intel_gpu_tools.h b/lib/intel_io.h
index 591fd3f4..591fd3f4 100644
--- a/lib/intel_gpu_tools.h
+++ b/lib/intel_io.h
diff --git a/lib/intel_iosf.c b/lib/intel_iosf.c
index b7b4ce23..ea7a320a 100644
--- a/lib/intel_iosf.c
+++ b/lib/intel_iosf.c
@@ -3,7 +3,7 @@
 #include <stdio.h>
 #include <err.h>
 #include <errno.h>
-#include "intel_gpu_tools.h"
+#include "intel_io.h"
 #include "intel_reg.h"
 
 #define TIMEOUT_US 500000
diff --git a/lib/intel_mmio.c b/lib/intel_mmio.c
index 3e1aac74..444e4450 100644
--- a/lib/intel_mmio.c
+++ b/lib/intel_mmio.c
@@ -41,7 +41,7 @@
 #include <sys/stat.h>
 #include <sys/mman.h>
 
-#include "intel_gpu_tools.h"
+#include "intel_io.h"
 #include "igt_debugfs.h"
 #include "intel_chipset.h"
 
diff --git a/lib/intel_os.c b/lib/intel_os.c
index 4b72f517..14dda147 100644
--- a/lib/intel_os.c
+++ b/lib/intel_os.c
@@ -47,7 +47,7 @@
 #include <sys/swap.h>
 #endif
 
-#include "intel_gpu_tools.h"
+#include "intel_io.h"
 #include "i915_drm.h"
 #include "drmtest.h"
 
diff --git a/lib/intel_reg_map.c b/lib/intel_reg_map.c
index ec63d79e..402274ba 100644
--- a/lib/intel_reg_map.c
+++ b/lib/intel_reg_map.c
@@ -29,7 +29,7 @@
 #include <stdarg.h>
 #include <stdlib.h>
 #include <sys/types.h>
-#include "intel_gpu_tools.h"
+#include "intel_io.h"
 #include "intel_chipset.h"
 
 static struct intel_register_range gen_bwcl_register_map[] = {
diff --git a/lib/ioctl_wrappers.c b/lib/ioctl_wrappers.c
index 5806f2a1..24185491 100644
--- a/lib/ioctl_wrappers.c
+++ b/lib/ioctl_wrappers.c
@@ -52,7 +52,7 @@
 #include "drmtest.h"
 #include "i915_drm.h"
 #include "intel_chipset.h"
-#include "intel_gpu_tools.h"
+#include "intel_io.h"
 #include "igt_debugfs.h"
 #include "../version.h"
 #include "config.h"
diff --git a/lib/rendercopy_gen6.c b/lib/rendercopy_gen6.c
index a908ae6b..d806ceff 100644
--- a/lib/rendercopy_gen6.c
+++ b/lib/rendercopy_gen6.c
@@ -15,7 +15,7 @@
 #include "drmtest.h"
 #include "intel_bufmgr.h"
 #include "intel_batchbuffer.h"
-#include "intel_gpu_tools.h"
+#include "intel_io.h"
 #include "rendercopy.h"
 #include "gen6_render.h"
 #include "intel_reg.h"
diff --git a/lib/rendercopy_gen7.c b/lib/rendercopy_gen7.c
index 75e05716..1dc639f3 100644
--- a/lib/rendercopy_gen7.c
+++ b/lib/rendercopy_gen7.c
@@ -15,7 +15,7 @@
 #include "drmtest.h"
 #include "intel_bufmgr.h"
 #include "intel_batchbuffer.h"
-#include "intel_gpu_tools.h"
+#include "intel_io.h"
 #include "intel_chipset.h"
 #include "rendercopy.h"
 #include "gen7_render.h"
diff --git a/lib/rendercopy_gen8.c b/lib/rendercopy_gen8.c
index ef19ebf4..424afa0a 100644
--- a/lib/rendercopy_gen8.c
+++ b/lib/rendercopy_gen8.c
@@ -15,7 +15,7 @@
 #include "drmtest.h"
 #include "intel_bufmgr.h"
 #include "intel_batchbuffer.h"
-#include "intel_gpu_tools.h"
+#include "intel_io.h"
 #include "rendercopy.h"
 #include "gen8_render.h"
 #include "intel_reg.h"
diff --git a/lib/rendercopy_i830.c b/lib/rendercopy_i830.c
index 5ebd31a4..f0235a53 100644
--- a/lib/rendercopy_i830.c
+++ b/lib/rendercopy_i830.c
@@ -14,7 +14,7 @@
 #include "drmtest.h"
 #include "intel_bufmgr.h"
 #include "intel_batchbuffer.h"
-#include "intel_gpu_tools.h"
+#include "intel_io.h"
 
 #include "i830_reg.h"
 #include "rendercopy.h"
diff --git a/lib/rendercopy_i915.c b/lib/rendercopy_i915.c
index b63c5cc4..1acf9da3 100644
--- a/lib/rendercopy_i915.c
+++ b/lib/rendercopy_i915.c
@@ -14,7 +14,7 @@
 #include "drmtest.h"
 #include "intel_bufmgr.h"
 #include "intel_batchbuffer.h"
-#include "intel_gpu_tools.h"
+#include "intel_io.h"
 
 #include "i915_reg.h"
 #include "i915_3d.h"
diff --git a/tests/ddi_compute_wrpll.c b/tests/ddi_compute_wrpll.c
index c1db6c08..02a96547 100644
--- a/tests/ddi_compute_wrpll.c
+++ b/tests/ddi_compute_wrpll.c
@@ -3,7 +3,7 @@
 #include <stdint.h>
 #include <stdlib.h>
 
-#include "intel_gpu_tools.h"
+#include "intel_io.h"
 #include "drmtest.h"
 
 #define LC_FREQ 2700
diff --git a/tests/drm_vma_limiter.c b/tests/drm_vma_limiter.c
index f14ced8c..e1381fe3 100644
--- a/tests/drm_vma_limiter.c
+++ b/tests/drm_vma_limiter.c
@@ -37,7 +37,7 @@
 #include "drmtest.h"
 #include "intel_bufmgr.h"
 #include "intel_batchbuffer.h"
-#include "intel_gpu_tools.h"
+#include "intel_io.h"
 #include "intel_chipset.h"
 
 static drm_intel_bufmgr *bufmgr;
diff --git a/tests/drm_vma_limiter_cached.c b/tests/drm_vma_limiter_cached.c
index 7c40541c..3b41caad 100644
--- a/tests/drm_vma_limiter_cached.c
+++ b/tests/drm_vma_limiter_cached.c
@@ -37,7 +37,7 @@
 #include "drmtest.h"
 #include "intel_bufmgr.h"
 #include "intel_batchbuffer.h"
-#include "intel_gpu_tools.h"
+#include "intel_io.h"
 #include "intel_chipset.h"
 
 static drm_intel_bufmgr *bufmgr;
diff --git a/tests/drm_vma_limiter_cpu.c b/tests/drm_vma_limiter_cpu.c
index 4da46737..e17a679d 100644
--- a/tests/drm_vma_limiter_cpu.c
+++ b/tests/drm_vma_limiter_cpu.c
@@ -37,7 +37,7 @@
 #include "drmtest.h"
 #include "intel_bufmgr.h"
 #include "intel_batchbuffer.h"
-#include "intel_gpu_tools.h"
+#include "intel_io.h"
 #include "intel_chipset.h"
 
 static drm_intel_bufmgr *bufmgr;
diff --git a/tests/drm_vma_limiter_gtt.c b/tests/drm_vma_limiter_gtt.c
index 283bf6b4..303e86da 100644
--- a/tests/drm_vma_limiter_gtt.c
+++ b/tests/drm_vma_limiter_gtt.c
@@ -37,7 +37,7 @@
 #include "drmtest.h"
 #include "intel_bufmgr.h"
 #include "intel_batchbuffer.h"
-#include "intel_gpu_tools.h"
+#include "intel_io.h"
 #include "intel_chipset.h"
 
 static drm_intel_bufmgr *bufmgr;
diff --git a/tests/gem_bad_address.c b/tests/gem_bad_address.c
index 58819357..f8fda90d 100644
--- a/tests/gem_bad_address.c
+++ b/tests/gem_bad_address.c
@@ -40,7 +40,7 @@
 #include "intel_bufmgr.h"
 #include "intel_chipset.h"
 #include "intel_batchbuffer.h"
-#include "intel_gpu_tools.h"
+#include "intel_io.h"
 
 static drm_intel_bufmgr *bufmgr;
 struct intel_batchbuffer *batch;
diff --git a/tests/gem_bad_batch.c b/tests/gem_bad_batch.c
index 5bb08b44..33b3241f 100644
--- a/tests/gem_bad_batch.c
+++ b/tests/gem_bad_batch.c
@@ -40,7 +40,7 @@
 #include "intel_bufmgr.h"
 #include "intel_batchbuffer.h"
 #include "intel_chipset.h"
-#include "intel_gpu_tools.h"
+#include "intel_io.h"
 
 static drm_intel_bufmgr *bufmgr;
 struct intel_batchbuffer *batch;
diff --git a/tests/gem_bad_blit.c b/tests/gem_bad_blit.c
index ec414eaf..9c031179 100644
--- a/tests/gem_bad_blit.c
+++ b/tests/gem_bad_blit.c
@@ -55,7 +55,7 @@
 #include "intel_bufmgr.h"
 #include "intel_batchbuffer.h"
 #include "intel_chipset.h"
-#include "intel_gpu_tools.h"
+#include "intel_io.h"
 
 static drm_intel_bufmgr *bufmgr;
 struct intel_batchbuffer *batch;
diff --git a/tests/gem_caching.c b/tests/gem_caching.c
index da6f2d8f..3d51f261 100644
--- a/tests/gem_caching.c
+++ b/tests/gem_caching.c
@@ -39,7 +39,7 @@
 #include "drmtest.h"
 #include "intel_bufmgr.h"
 #include "intel_batchbuffer.h"
-#include "intel_gpu_tools.h"
+#include "intel_io.h"
 #include "intel_chipset.h"
 
 /*
diff --git a/tests/gem_concurrent_blit.c b/tests/gem_concurrent_blit.c
index 29f42c7d..03acf89c 100644
--- a/tests/gem_concurrent_blit.c
+++ b/tests/gem_concurrent_blit.c
@@ -49,7 +49,7 @@
 #include "drmtest.h"
 #include "intel_bufmgr.h"
 #include "intel_batchbuffer.h"
-#include "intel_gpu_tools.h"
+#include "intel_io.h"
 #include "intel_chipset.h"
 
 static void
diff --git a/tests/gem_cpu_reloc.c b/tests/gem_cpu_reloc.c
index 77d9109e..e0276e7f 100644
--- a/tests/gem_cpu_reloc.c
+++ b/tests/gem_cpu_reloc.c
@@ -58,7 +58,7 @@
 #include "drmtest.h"
 #include "intel_bufmgr.h"
 #include "intel_batchbuffer.h"
-#include "intel_gpu_tools.h"
+#include "intel_io.h"
 #include "intel_chipset.h"
 
 static uint32_t use_blt;
diff --git a/tests/gem_cs_prefetch.c b/tests/gem_cs_prefetch.c
index 842e4276..ffa80f36 100644
--- a/tests/gem_cs_prefetch.c
+++ b/tests/gem_cs_prefetch.c
@@ -48,7 +48,7 @@
 #include "drmtest.h"
 #include "intel_bufmgr.h"
 #include "intel_batchbuffer.h"
-#include "intel_gpu_tools.h"
+#include "intel_io.h"
 #include "intel_chipset.h"
 
 static drm_intel_bufmgr *bufmgr;
diff --git a/tests/gem_cs_tlb.c b/tests/gem_cs_tlb.c
index 7d5c99dc..8f7bc61c 100644
--- a/tests/gem_cs_tlb.c
+++ b/tests/gem_cs_tlb.c
@@ -49,7 +49,7 @@
 #include "drm.h"
 #include "ioctl_wrappers.h"
 #include "drmtest.h"
-#include "intel_gpu_tools.h"
+#include "intel_io.h"
 
 #define LOCAL_I915_EXEC_VEBOX (4<<0)
 #define BATCH_SIZE (1024*1024)
diff --git a/tests/gem_ctx_basic.c b/tests/gem_ctx_basic.c
index 3dbef2bd..3e9b6880 100644
--- a/tests/gem_ctx_basic.c
+++ b/tests/gem_ctx_basic.c
@@ -45,7 +45,7 @@
 #include "drmtest.h"
 #include "intel_bufmgr.h"
 #include "intel_batchbuffer.h"
-#include "intel_gpu_tools.h"
+#include "intel_io.h"
 #include "intel_chipset.h"
 
 /* options */
diff --git a/tests/gem_double_irq_loop.c b/tests/gem_double_irq_loop.c
index f5c76296..ee9846c3 100644
--- a/tests/gem_double_irq_loop.c
+++ b/tests/gem_double_irq_loop.c
@@ -38,7 +38,7 @@
 #include "drmtest.h"
 #include "intel_bufmgr.h"
 #include "intel_batchbuffer.h"
-#include "intel_gpu_tools.h"
+#include "intel_io.h"
 #include "i830_reg.h"
 #include "intel_chipset.h"
 
diff --git a/tests/gem_dummy_reloc_loop.c b/tests/gem_dummy_reloc_loop.c
index 7c9da637..a61b59b0 100644
--- a/tests/gem_dummy_reloc_loop.c
+++ b/tests/gem_dummy_reloc_loop.c
@@ -38,7 +38,7 @@
 #include "drmtest.h"
 #include "intel_bufmgr.h"
 #include "intel_batchbuffer.h"
-#include "intel_gpu_tools.h"
+#include "intel_io.h"
 #include "i830_reg.h"
 #include "intel_chipset.h"
 
diff --git a/tests/gem_exec_bad_domains.c b/tests/gem_exec_bad_domains.c
index 0000e9ed..6fb9edb6 100644
--- a/tests/gem_exec_bad_domains.c
+++ b/tests/gem_exec_bad_domains.c
@@ -38,7 +38,7 @@
 #include "drmtest.h"
 #include "intel_bufmgr.h"
 #include "intel_batchbuffer.h"
-#include "intel_gpu_tools.h"
+#include "intel_io.h"
 #include "intel_chipset.h"
 
 /* Testcase: Test whether the kernel rejects relocations with non-gpu domains
diff --git a/tests/gem_exec_blt.c b/tests/gem_exec_blt.c
index 6c3ea37d..ee979e7f 100644
--- a/tests/gem_exec_blt.c
+++ b/tests/gem_exec_blt.c
@@ -40,7 +40,7 @@
 #include "ioctl_wrappers.h"
 #include "drmtest.h"
 #include "intel_chipset.h"
-#include "intel_gpu_tools.h"
+#include "intel_io.h"
 
 #define OBJECT_SIZE 16384
 
diff --git a/tests/gem_exec_faulting_reloc.c b/tests/gem_exec_faulting_reloc.c
index 51e5b6ed..acd703b6 100644
--- a/tests/gem_exec_faulting_reloc.c
+++ b/tests/gem_exec_faulting_reloc.c
@@ -40,7 +40,7 @@
 #include "ioctl_wrappers.h"
 #include "drmtest.h"
 #include "intel_chipset.h"
-#include "intel_gpu_tools.h"
+#include "intel_io.h"
 #include "igt_debugfs.h"
 
 /* Testcase: Submit patches with relocations in memory that will fault
diff --git a/tests/gem_exec_nop.c b/tests/gem_exec_nop.c
index 28ec66b3..eaece796 100644
--- a/tests/gem_exec_nop.c
+++ b/tests/gem_exec_nop.c
@@ -39,7 +39,7 @@
 #include "drm.h"
 #include "ioctl_wrappers.h"
 #include "drmtest.h"
-#include "intel_gpu_tools.h"
+#include "intel_io.h"
 
 #define LOCAL_I915_EXEC_VEBOX (4<<0)
 
diff --git a/tests/gem_fenced_exec_thrash.c b/tests/gem_fenced_exec_thrash.c
index 2ba85f2b..3194e340 100644
--- a/tests/gem_fenced_exec_thrash.c
+++ b/tests/gem_fenced_exec_thrash.c
@@ -40,7 +40,7 @@
 #include "ioctl_wrappers.h"
 #include "drmtest.h"
 #include "intel_chipset.h"
-#include "intel_gpu_tools.h"
+#include "intel_io.h"
 
 #define WIDTH 1024
 #define HEIGHT 1024
diff --git a/tests/gem_gtt_cpu_tlb.c b/tests/gem_gtt_cpu_tlb.c
index c087a379..953070c0 100644
--- a/tests/gem_gtt_cpu_tlb.c
+++ b/tests/gem_gtt_cpu_tlb.c
@@ -42,7 +42,7 @@
 #include "drm.h"
 #include "ioctl_wrappers.h"
 #include "drmtest.h"
-#include "intel_gpu_tools.h"
+#include "intel_io.h"
 
 #define OBJ_SIZE (1024*1024)
 
diff --git a/tests/gem_hang.c b/tests/gem_hang.c
index 5b1f5dc8..656d9cd1 100644
--- a/tests/gem_hang.c
+++ b/tests/gem_hang.c
@@ -40,7 +40,7 @@
 #include "intel_bufmgr.h"
 #include "intel_chipset.h"
 #include "intel_batchbuffer.h"
-#include "intel_gpu_tools.h"
+#include "intel_io.h"
 
 static drm_intel_bufmgr *bufmgr;
 struct intel_batchbuffer *batch;
diff --git a/tests/gem_hangcheck_forcewake.c b/tests/gem_hangcheck_forcewake.c
index d1bf000e..64f839f5 100644
--- a/tests/gem_hangcheck_forcewake.c
+++ b/tests/gem_hangcheck_forcewake.c
@@ -38,7 +38,7 @@
 #include "drmtest.h"
 #include "intel_bufmgr.h"
 #include "intel_batchbuffer.h"
-#include "intel_gpu_tools.h"
+#include "intel_io.h"
 #include "intel_chipset.h"
 
 /*
diff --git a/tests/gem_linear_blits.c b/tests/gem_linear_blits.c
index a7e398fb..1b674228 100644
--- a/tests/gem_linear_blits.c
+++ b/tests/gem_linear_blits.c
@@ -47,7 +47,7 @@
 #include "drmtest.h"
 #include "intel_bufmgr.h"
 #include "intel_batchbuffer.h"
-#include "intel_gpu_tools.h"
+#include "intel_io.h"
 
 #define WIDTH 512
 #define HEIGHT 512
diff --git a/tests/gem_media_fill.c b/tests/gem_media_fill.c
index 68bbdf23..cb081d8b 100644
--- a/tests/gem_media_fill.c
+++ b/tests/gem_media_fill.c
@@ -47,7 +47,7 @@
 #include "drmtest.h"
 #include "intel_bufmgr.h"
 #include "intel_batchbuffer.h"
-#include "intel_gpu_tools.h"
+#include "intel_io.h"
 #include "intel_chipset.h"
 
 #define WIDTH 64
diff --git a/tests/gem_non_secure_batch.c b/tests/gem_non_secure_batch.c
index 1d96222d..6a73e84e 100644
--- a/tests/gem_non_secure_batch.c
+++ b/tests/gem_non_secure_batch.c
@@ -39,7 +39,7 @@
 #include "intel_bufmgr.h"
 #include "intel_batchbuffer.h"
 #include "intel_chipset.h"
-#include "intel_gpu_tools.h"
+#include "intel_io.h"
 #include "i830_reg.h"
 
 static drm_intel_bufmgr *bufmgr;
diff --git a/tests/gem_partial_pwrite_pread.c b/tests/gem_partial_pwrite_pread.c
index c2465373..a43a2b64 100644
--- a/tests/gem_partial_pwrite_pread.c
+++ b/tests/gem_partial_pwrite_pread.c
@@ -39,7 +39,7 @@
 #include "intel_chipset.h"
 #include "intel_bufmgr.h"
 #include "intel_batchbuffer.h"
-#include "intel_gpu_tools.h"
+#include "intel_io.h"
 
 /*
  * Testcase: pwrite/pread consistency when touching partial cachelines
diff --git a/tests/gem_persistent_relocs.c b/tests/gem_persistent_relocs.c
index 1a705fad..1795160b 100644
--- a/tests/gem_persistent_relocs.c
+++ b/tests/gem_persistent_relocs.c
@@ -42,7 +42,7 @@
 #include "intel_bufmgr.h"
 #include "intel_chipset.h"
 #include "intel_batchbuffer.h"
-#include "intel_gpu_tools.h"
+#include "intel_io.h"
 #include "igt_debugfs.h"
 
 /*
diff --git a/tests/gem_pin.c b/tests/gem_pin.c
index e57ddcc4..9572d288 100644
--- a/tests/gem_pin.c
+++ b/tests/gem_pin.c
@@ -39,7 +39,7 @@
 #include "ioctl_wrappers.h"
 #include "drmtest.h"
 #include "intel_chipset.h"
-#include "intel_gpu_tools.h"
+#include "intel_io.h"
 
 #define COPY_BLT_CMD            (2<<29|0x53<<22|0x6)
 #define BLT_WRITE_ALPHA         (1<<21)
diff --git a/tests/gem_pipe_control_store_loop.c b/tests/gem_pipe_control_store_loop.c
index 41bfc1b0..c95c2bdf 100644
--- a/tests/gem_pipe_control_store_loop.c
+++ b/tests/gem_pipe_control_store_loop.c
@@ -45,7 +45,7 @@
 #include "intel_bufmgr.h"
 #include "intel_batchbuffer.h"
 #include "intel_chipset.h"
-#include "intel_gpu_tools.h"
+#include "intel_io.h"
 
 static drm_intel_bufmgr *bufmgr;
 struct intel_batchbuffer *batch;
diff --git a/tests/gem_pread_after_blit.c b/tests/gem_pread_after_blit.c
index f263286c..6c3f8227 100644
--- a/tests/gem_pread_after_blit.c
+++ b/tests/gem_pread_after_blit.c
@@ -48,7 +48,7 @@
 #include "intel_chipset.h"
 #include "intel_bufmgr.h"
 #include "intel_batchbuffer.h"
-#include "intel_gpu_tools.h"
+#include "intel_io.h"
 
 static drm_intel_bufmgr *bufmgr;
 struct intel_batchbuffer *batch;
diff --git a/tests/gem_pwrite_pread.c b/tests/gem_pwrite_pread.c
index c3314e48..7a0cdf39 100644
--- a/tests/gem_pwrite_pread.c
+++ b/tests/gem_pwrite_pread.c
@@ -42,7 +42,7 @@
 #include "intel_chipset.h"
 #include "intel_bufmgr.h"
 #include "intel_batchbuffer.h"
-#include "intel_gpu_tools.h"
+#include "intel_io.h"
 
 #define OBJECT_SIZE 16384
 
diff --git a/tests/gem_reloc_overflow.c b/tests/gem_reloc_overflow.c
index 98b7dd4a..06a315fd 100644
--- a/tests/gem_reloc_overflow.c
+++ b/tests/gem_reloc_overflow.c
@@ -46,7 +46,7 @@
 #include "ioctl_wrappers.h"
 #include "intel_chipset.h"
 #include "drmtest.h"
-#include "intel_gpu_tools.h"
+#include "intel_io.h"
 
 /*
  * Testcase: Kernel relocation overflows are caught.
diff --git a/tests/gem_reloc_vs_gpu.c b/tests/gem_reloc_vs_gpu.c
index 07c79b33..8e801876 100644
--- a/tests/gem_reloc_vs_gpu.c
+++ b/tests/gem_reloc_vs_gpu.c
@@ -42,7 +42,7 @@
 #include "intel_bufmgr.h"
 #include "intel_batchbuffer.h"
 #include "intel_chipset.h"
-#include "intel_gpu_tools.h"
+#include "intel_io.h"
 #include "igt_debugfs.h"
 
 /*
diff --git a/tests/gem_render_copy.c b/tests/gem_render_copy.c
index 54f971d1..12ac18d3 100644
--- a/tests/gem_render_copy.c
+++ b/tests/gem_render_copy.c
@@ -47,7 +47,7 @@
 #include "drmtest.h"
 #include "intel_bufmgr.h"
 #include "intel_batchbuffer.h"
-#include "intel_gpu_tools.h"
+#include "intel_io.h"
 #include "intel_chipset.h"
 
 #define WIDTH 512
diff --git a/tests/gem_render_linear_blits.c b/tests/gem_render_linear_blits.c
index ac2b29b0..14a3ae7e 100644
--- a/tests/gem_render_linear_blits.c
+++ b/tests/gem_render_linear_blits.c
@@ -52,7 +52,7 @@
 #include "drmtest.h"
 #include "intel_bufmgr.h"
 #include "intel_batchbuffer.h"
-#include "intel_gpu_tools.h"
+#include "intel_io.h"
 #include "intel_chipset.h"
 
 #define WIDTH 512
diff --git a/tests/gem_render_tiled_blits.c b/tests/gem_render_tiled_blits.c
index 8481e51d..bee063fc 100644
--- a/tests/gem_render_tiled_blits.c
+++ b/tests/gem_render_tiled_blits.c
@@ -48,7 +48,7 @@
 #include "drmtest.h"
 #include "intel_bufmgr.h"
 #include "intel_batchbuffer.h"
-#include "intel_gpu_tools.h"
+#include "intel_io.h"
 #include "intel_chipset.h"
 
 #define WIDTH 512
diff --git a/tests/gem_reset_stats.c b/tests/gem_reset_stats.c
index 90befd70..a6d4edc7 100644
--- a/tests/gem_reset_stats.c
+++ b/tests/gem_reset_stats.c
@@ -46,7 +46,7 @@
 #include "intel_bufmgr.h"
 #include "intel_chipset.h"
 #include "intel_batchbuffer.h"
-#include "intel_gpu_tools.h"
+#include "intel_io.h"
 
 #define RS_NO_ERROR      0
 #define RS_BATCH_ACTIVE  (1 << 0)
diff --git a/tests/gem_ring_sync_loop.c b/tests/gem_ring_sync_loop.c
index 5010d356..d4e7e2a8 100644
--- a/tests/gem_ring_sync_loop.c
+++ b/tests/gem_ring_sync_loop.c
@@ -38,7 +38,7 @@
 #include "drmtest.h"
 #include "intel_bufmgr.h"
 #include "intel_batchbuffer.h"
-#include "intel_gpu_tools.h"
+#include "intel_io.h"
 #include "i830_reg.h"
 #include "intel_chipset.h"
 
diff --git a/tests/gem_ringfill.c b/tests/gem_ringfill.c
index 716ff569..88c8a8ee 100644
--- a/tests/gem_ringfill.c
+++ b/tests/gem_ringfill.c
@@ -47,7 +47,7 @@
 #include "intel_bufmgr.h"
 #include "intel_chipset.h"
 #include "intel_batchbuffer.h"
-#include "intel_gpu_tools.h"
+#include "intel_io.h"
 
 struct bo {
 	const char *ring;
diff --git a/tests/gem_seqno_wrap.c b/tests/gem_seqno_wrap.c
index 30d1a868..a557c985 100644
--- a/tests/gem_seqno_wrap.c
+++ b/tests/gem_seqno_wrap.c
@@ -48,7 +48,7 @@
 #include "igt_core.h"
 #include "intel_bufmgr.h"
 #include "intel_batchbuffer.h"
-#include "intel_gpu_tools.h"
+#include "intel_io.h"
 #include "intel_chipset.h"
 
 static int devid;
diff --git a/tests/gem_set_tiling_vs_blt.c b/tests/gem_set_tiling_vs_blt.c
index 1ad0e5c1..e2f3f975 100644
--- a/tests/gem_set_tiling_vs_blt.c
+++ b/tests/gem_set_tiling_vs_blt.c
@@ -59,7 +59,7 @@
 #include "intel_bufmgr.h"
 #include "intel_batchbuffer.h"
 #include "intel_chipset.h"
-#include "intel_gpu_tools.h"
+#include "intel_io.h"
 
 static drm_intel_bufmgr *bufmgr;
 struct intel_batchbuffer *batch;
diff --git a/tests/gem_set_tiling_vs_gtt.c b/tests/gem_set_tiling_vs_gtt.c
index abe09639..384a85ea 100644
--- a/tests/gem_set_tiling_vs_gtt.c
+++ b/tests/gem_set_tiling_vs_gtt.c
@@ -37,7 +37,7 @@
 #include "drm.h"
 #include "ioctl_wrappers.h"
 #include "drmtest.h"
-#include "intel_gpu_tools.h"
+#include "intel_io.h"
 #include "intel_chipset.h"
 
 #define OBJECT_SIZE (1024*1024)
diff --git a/tests/gem_set_tiling_vs_pwrite.c b/tests/gem_set_tiling_vs_pwrite.c
index d07ebafc..cc818f14 100644
--- a/tests/gem_set_tiling_vs_pwrite.c
+++ b/tests/gem_set_tiling_vs_pwrite.c
@@ -37,7 +37,7 @@
 #include "drm.h"
 #include "ioctl_wrappers.h"
 #include "drmtest.h"
-#include "intel_gpu_tools.h"
+#include "intel_io.h"
 
 #define OBJECT_SIZE (1024*1024)
 #define TEST_STRIDE (1024*4)
diff --git a/tests/gem_storedw_batches_loop.c b/tests/gem_storedw_batches_loop.c
index f07085c4..90f004ed 100644
--- a/tests/gem_storedw_batches_loop.c
+++ b/tests/gem_storedw_batches_loop.c
@@ -40,7 +40,7 @@
 #include "intel_bufmgr.h"
 #include "intel_chipset.h"
 #include "intel_batchbuffer.h"
-#include "intel_gpu_tools.h"
+#include "intel_io.h"
 
 static drm_intel_bufmgr *bufmgr;
 static drm_intel_bo *target_bo;
diff --git a/tests/gem_storedw_loop_blt.c b/tests/gem_storedw_loop_blt.c
index b242b292..7cbf86d3 100644
--- a/tests/gem_storedw_loop_blt.c
+++ b/tests/gem_storedw_loop_blt.c
@@ -39,7 +39,7 @@
 #include "drmtest.h"
 #include "intel_bufmgr.h"
 #include "intel_batchbuffer.h"
-#include "intel_gpu_tools.h"
+#include "intel_io.h"
 #include "intel_chipset.h"
 
 static drm_intel_bufmgr *bufmgr;
diff --git a/tests/gem_storedw_loop_bsd.c b/tests/gem_storedw_loop_bsd.c
index 482e276b..c3ab3225 100644
--- a/tests/gem_storedw_loop_bsd.c
+++ b/tests/gem_storedw_loop_bsd.c
@@ -39,7 +39,7 @@
 #include "drmtest.h"
 #include "intel_bufmgr.h"
 #include "intel_batchbuffer.h"
-#include "intel_gpu_tools.h"
+#include "intel_io.h"
 #include "intel_chipset.h"
 
 static drm_intel_bufmgr *bufmgr;
diff --git a/tests/gem_storedw_loop_render.c b/tests/gem_storedw_loop_render.c
index 7cbc0a80..43ca0959 100644
--- a/tests/gem_storedw_loop_render.c
+++ b/tests/gem_storedw_loop_render.c
@@ -39,7 +39,7 @@
 #include "drmtest.h"
 #include "intel_bufmgr.h"
 #include "intel_batchbuffer.h"
-#include "intel_gpu_tools.h"
+#include "intel_io.h"
 #include "intel_chipset.h"
 
 static drm_intel_bufmgr *bufmgr;
diff --git a/tests/gem_storedw_loop_vebox.c b/tests/gem_storedw_loop_vebox.c
index 872d4b2a..c7136215 100644
--- a/tests/gem_storedw_loop_vebox.c
+++ b/tests/gem_storedw_loop_vebox.c
@@ -38,7 +38,7 @@
 #include "drmtest.h"
 #include "intel_bufmgr.h"
 #include "intel_batchbuffer.h"
-#include "intel_gpu_tools.h"
+#include "intel_io.h"
 #include "intel_chipset.h"
 
 #define LOCAL_I915_EXEC_VEBOX (4<<0)
diff --git a/tests/gem_stress.c b/tests/gem_stress.c
index d6434bcc..bf3cde76 100644
--- a/tests/gem_stress.c
+++ b/tests/gem_stress.c
@@ -64,7 +64,7 @@
 #include "drmtest.h"
 #include "intel_bufmgr.h"
 #include "intel_batchbuffer.h"
-#include "intel_gpu_tools.h"
+#include "intel_io.h"
 #include "intel_chipset.h"
 
 #define CMD_POLY_STIPPLE_OFFSET       0x7906
diff --git a/tests/gem_tiled_blits.c b/tests/gem_tiled_blits.c
index 00b69554..09be42ef 100644
--- a/tests/gem_tiled_blits.c
+++ b/tests/gem_tiled_blits.c
@@ -55,7 +55,7 @@
 #include "intel_bufmgr.h"
 #include "intel_batchbuffer.h"
 #include "intel_chipset.h"
-#include "intel_gpu_tools.h"
+#include "intel_io.h"
 
 static drm_intel_bufmgr *bufmgr;
 struct intel_batchbuffer *batch;
diff --git a/tests/gem_tiled_fence_blits.c b/tests/gem_tiled_fence_blits.c
index 3dfcf003..7cefca0b 100644
--- a/tests/gem_tiled_fence_blits.c
+++ b/tests/gem_tiled_fence_blits.c
@@ -54,7 +54,7 @@
 #include "drmtest.h"
 #include "intel_bufmgr.h"
 #include "intel_batchbuffer.h"
-#include "intel_gpu_tools.h"
+#include "intel_io.h"
 #include "intel_chipset.h"
 
 static drm_intel_bufmgr *bufmgr;
diff --git a/tests/gem_tiled_partial_pwrite_pread.c b/tests/gem_tiled_partial_pwrite_pread.c
index 322cca9d..26fc145d 100644
--- a/tests/gem_tiled_partial_pwrite_pread.c
+++ b/tests/gem_tiled_partial_pwrite_pread.c
@@ -39,7 +39,7 @@
 #include "intel_bufmgr.h"
 #include "intel_chipset.h"
 #include "intel_batchbuffer.h"
-#include "intel_gpu_tools.h"
+#include "intel_io.h"
 
 /*
  * Testcase: pwrite/pread consistency when touching partial cachelines
diff --git a/tests/gem_tiled_pread.c b/tests/gem_tiled_pread.c
index 6f104a6c..73ed0bf6 100644
--- a/tests/gem_tiled_pread.c
+++ b/tests/gem_tiled_pread.c
@@ -47,7 +47,7 @@
 #include "drm.h"
 #include "ioctl_wrappers.h"
 #include "drmtest.h"
-#include "intel_gpu_tools.h"
+#include "intel_io.h"
 #include "intel_chipset.h"
 
 #define WIDTH 512
diff --git a/tests/gem_tiled_pread_pwrite.c b/tests/gem_tiled_pread_pwrite.c
index 06c32fcc..08176f3d 100644
--- a/tests/gem_tiled_pread_pwrite.c
+++ b/tests/gem_tiled_pread_pwrite.c
@@ -56,7 +56,7 @@
 #include "drm.h"
 #include "ioctl_wrappers.h"
 #include "drmtest.h"
-#include "intel_gpu_tools.h"
+#include "intel_io.h"
 
 #define WIDTH 512
 #define HEIGHT 512
diff --git a/tests/gem_tiled_swapping.c b/tests/gem_tiled_swapping.c
index 28d21d45..fd9b40f3 100644
--- a/tests/gem_tiled_swapping.c
+++ b/tests/gem_tiled_swapping.c
@@ -56,7 +56,7 @@
 #include "drm.h"
 #include "ioctl_wrappers.h"
 #include "drmtest.h"
-#include "intel_gpu_tools.h"
+#include "intel_io.h"
 
 #define WIDTH 512
 #define HEIGHT 512
diff --git a/tests/gem_tiling_max_stride.c b/tests/gem_tiling_max_stride.c
index ded965ae..4d0553d4 100644
--- a/tests/gem_tiling_max_stride.c
+++ b/tests/gem_tiling_max_stride.c
@@ -38,7 +38,7 @@
 #include "drm.h"
 #include "ioctl_wrappers.h"
 #include "drmtest.h"
-#include "intel_gpu_tools.h"
+#include "intel_io.h"
 #include "intel_chipset.h"
 
 static void do_test_invalid_tiling(int fd, uint32_t handle, int tiling, int stride)
diff --git a/tests/gem_unfence_active_buffers.c b/tests/gem_unfence_active_buffers.c
index 9ccabe9f..21939312 100644
--- a/tests/gem_unfence_active_buffers.c
+++ b/tests/gem_unfence_active_buffers.c
@@ -52,7 +52,7 @@
 #include "drmtest.h"
 #include "intel_bufmgr.h"
 #include "intel_batchbuffer.h"
-#include "intel_gpu_tools.h"
+#include "intel_io.h"
 #include "intel_chipset.h"
 
 static drm_intel_bufmgr *bufmgr;
diff --git a/tests/gem_unref_active_buffers.c b/tests/gem_unref_active_buffers.c
index 89067057..cdc30990 100644
--- a/tests/gem_unref_active_buffers.c
+++ b/tests/gem_unref_active_buffers.c
@@ -45,7 +45,7 @@
 #include "drmtest.h"
 #include "intel_bufmgr.h"
 #include "intel_batchbuffer.h"
-#include "intel_gpu_tools.h"
+#include "intel_io.h"
 #include "intel_chipset.h"
 
 static drm_intel_bufmgr *bufmgr;
diff --git a/tests/gem_vmap_blits.c b/tests/gem_vmap_blits.c
index 157d6746..430338b7 100644
--- a/tests/gem_vmap_blits.c
+++ b/tests/gem_vmap_blits.c
@@ -49,7 +49,7 @@
 #include "drmtest.h"
 #include "intel_bufmgr.h"
 #include "intel_batchbuffer.h"
-#include "intel_gpu_tools.h"
+#include "intel_io.h"
 
 #if !defined(I915_PARAM_HAS_VMAP)
 #pragma message("No vmap support in drm, skipping")
diff --git a/tests/gem_wait_render_timeout.c b/tests/gem_wait_render_timeout.c
index d4c12fee..b0b77adc 100644
--- a/tests/gem_wait_render_timeout.c
+++ b/tests/gem_wait_render_timeout.c
@@ -42,7 +42,7 @@
 #include "drmtest.h"
 #include "intel_bufmgr.h"
 #include "intel_batchbuffer.h"
-#include "intel_gpu_tools.h"
+#include "intel_io.h"
 #include "intel_chipset.h"
 
 #define MSEC_PER_SEC	1000L
diff --git a/tests/gem_write_read_ring_switch.c b/tests/gem_write_read_ring_switch.c
index cd235c95..f19a7bef 100644
--- a/tests/gem_write_read_ring_switch.c
+++ b/tests/gem_write_read_ring_switch.c
@@ -39,7 +39,7 @@
 #include "intel_bufmgr.h"
 #include "intel_batchbuffer.h"
 #include "intel_chipset.h"
-#include "intel_gpu_tools.h"
+#include "intel_io.h"
 #include "i830_reg.h"
 
 #define LOCAL_I915_EXEC_VEBOX (4<<0)
diff --git a/tests/gen3_mixed_blits.c b/tests/gen3_mixed_blits.c
index 64041a0e..80b626cf 100644
--- a/tests/gen3_mixed_blits.c
+++ b/tests/gen3_mixed_blits.c
@@ -45,7 +45,7 @@
 #include "drm.h"
 #include "ioctl_wrappers.h"
 #include "drmtest.h"
-#include "intel_gpu_tools.h"
+#include "intel_io.h"
 #include "intel_chipset.h"
 
 #include "i915_reg.h"
diff --git a/tests/gen3_render_linear_blits.c b/tests/gen3_render_linear_blits.c
index eed3ba5e..3e2d1a48 100644
--- a/tests/gen3_render_linear_blits.c
+++ b/tests/gen3_render_linear_blits.c
@@ -44,7 +44,7 @@
 #include "drm.h"
 #include "ioctl_wrappers.h"
 #include "drmtest.h"
-#include "intel_gpu_tools.h"
+#include "intel_io.h"
 #include "intel_chipset.h"
 
 #include "i915_reg.h"
diff --git a/tests/gen3_render_mixed_blits.c b/tests/gen3_render_mixed_blits.c
index ac5452a8..09275f73 100644
--- a/tests/gen3_render_mixed_blits.c
+++ b/tests/gen3_render_mixed_blits.c
@@ -45,7 +45,7 @@
 #include "drm.h"
 #include "ioctl_wrappers.h"
 #include "drmtest.h"
-#include "intel_gpu_tools.h"
+#include "intel_io.h"
 #include "intel_chipset.h"
 
 #include "i915_reg.h"
diff --git a/tests/gen3_render_tiledx_blits.c b/tests/gen3_render_tiledx_blits.c
index 1b2a00c5..57428289 100644
--- a/tests/gen3_render_tiledx_blits.c
+++ b/tests/gen3_render_tiledx_blits.c
@@ -45,7 +45,7 @@
 #include "drm.h"
 #include "ioctl_wrappers.h"
 #include "drmtest.h"
-#include "intel_gpu_tools.h"
+#include "intel_io.h"
 #include "intel_chipset.h"
 
 #include "i915_reg.h"
diff --git a/tests/gen3_render_tiledy_blits.c b/tests/gen3_render_tiledy_blits.c
index 80305413..1765dca5 100644
--- a/tests/gen3_render_tiledy_blits.c
+++ b/tests/gen3_render_tiledy_blits.c
@@ -45,7 +45,7 @@
 #include "drm.h"
 #include "ioctl_wrappers.h"
 #include "drmtest.h"
-#include "intel_gpu_tools.h"
+#include "intel_io.h"
 #include "intel_chipset.h"
 
 #include "i915_reg.h"
diff --git a/tests/gen7_forcewake_mt.c b/tests/gen7_forcewake_mt.c
index 03eb6e92..fdc34ced 100644
--- a/tests/gen7_forcewake_mt.c
+++ b/tests/gen7_forcewake_mt.c
@@ -38,7 +38,7 @@
 #include "ioctl_wrappers.h"
 #include "i915_pciids.h"
 #include "drmtest.h"
-#include "intel_gpu_tools.h"
+#include "intel_io.h"
 #include "intel_chipset.h"
 
 #define FORCEWAKE_MT 0xa188
diff --git a/tests/kms_render.c b/tests/kms_render.c
index 7bff958b..2179e65d 100644
--- a/tests/kms_render.c
+++ b/tests/kms_render.c
@@ -36,7 +36,7 @@
 #include "testdisplay.h"
 #include "intel_bufmgr.h"
 #include "intel_batchbuffer.h"
-#include "intel_gpu_tools.h"
+#include "intel_io.h"
 #include "intel_chipset.h"
 #include "igt_kms.h"
 #include "ioctl_wrappers.h"
diff --git a/tests/kms_setmode.c b/tests/kms_setmode.c
index 4c1a5676..703e9326 100644
--- a/tests/kms_setmode.c
+++ b/tests/kms_setmode.c
@@ -36,7 +36,7 @@
 #include "drmtest.h"
 #include "intel_bufmgr.h"
 #include "intel_batchbuffer.h"
-#include "intel_gpu_tools.h"
+#include "intel_io.h"
 #include "igt_kms.h"
 
 #define MAX_CONNECTORS  10
diff --git a/tests/pm_lpsp.c b/tests/pm_lpsp.c
index 1dc7a73f..87397055 100644
--- a/tests/pm_lpsp.c
+++ b/tests/pm_lpsp.c
@@ -31,7 +31,7 @@
 
 #include "drmtest.h"
 #include "igt_kms.h"
-#include "intel_gpu_tools.h"
+#include "intel_io.h"
 #include "intel_chipset.h"
 
 /* We know that if we don't enable audio runtime PM, snd_hda_intel will never
diff --git a/tests/pm_pc8.c b/tests/pm_pc8.c
index 5a1e7470..3004c32e 100644
--- a/tests/pm_pc8.c
+++ b/tests/pm_pc8.c
@@ -43,7 +43,7 @@
 #include "drm.h"
 #include "drmtest.h"
 #include "intel_batchbuffer.h"
-#include "intel_gpu_tools.h"
+#include "intel_io.h"
 #include "intel_chipset.h"
 #include "ioctl_wrappers.h"
 #include "igt_kms.h"
diff --git a/tests/pm_rps.c b/tests/pm_rps.c
index 1f4b284c..ce65edd7 100644
--- a/tests/pm_rps.c
+++ b/tests/pm_rps.c
@@ -37,7 +37,7 @@
 #include <errno.h>
 
 #include "drmtest.h"
-#include "intel_gpu_tools.h"
+#include "intel_io.h"
 #include "intel_bufmgr.h"
 #include "intel_batchbuffer.h"
 #include "intel_chipset.h"
diff --git a/tests/prime_nv_api.c b/tests/prime_nv_api.c
index c510c1cf..73c0a0d2 100644
--- a/tests/prime_nv_api.c
+++ b/tests/prime_nv_api.c
@@ -16,7 +16,7 @@
 
 #include "intel_bufmgr.h"
 #include "nouveau.h"
-#include "intel_gpu_tools.h"
+#include "intel_io.h"
 #include "intel_batchbuffer.h"
 #include "drmtest.h"
 #include "intel_chipset.h"
diff --git a/tests/prime_nv_pcopy.c b/tests/prime_nv_pcopy.c
index 3f3814af..7fa2e34c 100644
--- a/tests/prime_nv_pcopy.c
+++ b/tests/prime_nv_pcopy.c
@@ -26,7 +26,7 @@
 #include "ioctl_wrappers.h"
 #include "intel_bufmgr.h"
 #include "nouveau.h"
-#include "intel_gpu_tools.h"
+#include "intel_io.h"
 #include "intel_batchbuffer.h"
 #include "intel_chipset.h"
 #include "drmtest.h"
diff --git a/tests/prime_nv_test.c b/tests/prime_nv_test.c
index ee54e7a6..8211cd6f 100644
--- a/tests/prime_nv_test.c
+++ b/tests/prime_nv_test.c
@@ -25,7 +25,7 @@
 #include "ioctl_wrappers.h"
 #include "intel_bufmgr.h"
 #include "nouveau.h"
-#include "intel_gpu_tools.h"
+#include "intel_io.h"
 #include "intel_batchbuffer.h"
 #include "intel_chipset.h"
 #include "drmtest.h"
diff --git a/tests/prime_udl.c b/tests/prime_udl.c
index 96661fcb..62b381a3 100644
--- a/tests/prime_udl.c
+++ b/tests/prime_udl.c
@@ -28,7 +28,7 @@
 
 #include "ioctl_wrappers.h"
 #include "intel_bufmgr.h"
-#include "intel_gpu_tools.h"
+#include "intel_io.h"
 #include "intel_batchbuffer.h"
 #include "drmtest.h"
 #include "intel_chipset.h"
diff --git a/tools/intel_audio_dump.c b/tools/intel_audio_dump.c
index 9762b4f7..26023743 100644
--- a/tools/intel_audio_dump.c
+++ b/tools/intel_audio_dump.c
@@ -33,7 +33,7 @@
 #include <string.h>
 #include <err.h>
 #include <arpa/inet.h>
-#include "intel_gpu_tools.h"
+#include "intel_io.h"
 #include "intel_reg.h"
 #include "intel_chipset.h"
 #include "drmtest.h"
diff --git a/tools/intel_backlight.c b/tools/intel_backlight.c
index e2591847..b866ec8e 100644
--- a/tools/intel_backlight.c
+++ b/tools/intel_backlight.c
@@ -30,7 +30,7 @@
 #include <stdio.h>
 #include <string.h>
 
-#include "intel_gpu_tools.h"
+#include "intel_io.h"
 #include "intel_chipset.h"
 #include "intel_reg.h"
 
diff --git a/tools/intel_bios_reader.c b/tools/intel_bios_reader.c
index 8eb46f3d..173772bf 100644
--- a/tools/intel_bios_reader.c
+++ b/tools/intel_bios_reader.c
@@ -36,7 +36,7 @@
 #include <sys/types.h>
 
 #include "intel_bios.h"
-#include "intel_gpu_tools.h"
+#include "intel_io.h"
 #include "intel_chipset.h"
 #include "drmtest.h"
 
diff --git a/tools/intel_dpio_read.c b/tools/intel_dpio_read.c
index 2196041a..09f03764 100644
--- a/tools/intel_dpio_read.c
+++ b/tools/intel_dpio_read.c
@@ -30,7 +30,7 @@
 #include <stdio.h>
 #include <err.h>
 #include <string.h>
-#include "intel_gpu_tools.h"
+#include "intel_io.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 c3c682a6..15c79efe 100644
--- a/tools/intel_dpio_write.c
+++ b/tools/intel_dpio_write.c
@@ -30,7 +30,7 @@
 #include <stdio.h>
 #include <err.h>
 #include <string.h>
-#include "intel_gpu_tools.h"
+#include "intel_io.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 b1d51b74..1eeff071 100644
--- a/tools/intel_error_decode.c
+++ b/tools/intel_error_decode.c
@@ -53,7 +53,7 @@
 #include <intel_bufmgr.h>
 
 #include "intel_chipset.h"
-#include "intel_gpu_tools.h"
+#include "intel_io.h"
 #include "instdone.h"
 #include "intel_reg.h"
 
diff --git a/tools/intel_forcewaked.c b/tools/intel_forcewaked.c
index b4e7b5cc..01ca0253 100644
--- a/tools/intel_forcewaked.c
+++ b/tools/intel_forcewaked.c
@@ -34,7 +34,7 @@
 #include <stdlib.h>
 #include <syslog.h>
 #include <unistd.h>
-#include "intel_gpu_tools.h"
+#include "intel_io.h"
 #include "intel_chipset.h"
 
 bool daemonized;
diff --git a/tools/intel_framebuffer_dump.c b/tools/intel_framebuffer_dump.c
index a254324c..624a9613 100644
--- a/tools/intel_framebuffer_dump.c
+++ b/tools/intel_framebuffer_dump.c
@@ -35,7 +35,7 @@
 #include <i915_drm.h>
 #include <cairo.h>
 
-#include "intel_gpu_tools.h"
+#include "intel_io.h"
 #include "drmtest.h"
 
 int main(int argc, char **argv)
diff --git a/tools/intel_gpu_time.c b/tools/intel_gpu_time.c
index 0b8ca9e4..4096f1c5 100644
--- a/tools/intel_gpu_time.c
+++ b/tools/intel_gpu_time.c
@@ -34,7 +34,7 @@
 #include <sys/resource.h>
 #include <sys/wait.h>
 
-#include "intel_gpu_tools.h"
+#include "intel_io.h"
 #include "intel_chipset.h"
 #include "intel_reg.h"
 
diff --git a/tools/intel_gpu_top.c b/tools/intel_gpu_top.c
index ccbe9736..a016bc9b 100644
--- a/tools/intel_gpu_top.c
+++ b/tools/intel_gpu_top.c
@@ -42,7 +42,7 @@
 #ifdef HAVE_TERMIOS_H
 #include <termios.h>
 #endif
-#include "intel_gpu_tools.h"
+#include "intel_io.h"
 #include "instdone.h"
 #include "intel_reg.h"
 #include "intel_chipset.h"
diff --git a/tools/intel_gtt.c b/tools/intel_gtt.c
index f3d1c308..9604a547 100644
--- a/tools/intel_gtt.c
+++ b/tools/intel_gtt.c
@@ -34,7 +34,7 @@
 #include <pciaccess.h>
 #include <unistd.h>
 
-#include "intel_gpu_tools.h"
+#include "intel_io.h"
 #include "intel_chipset.h"
 
 #define KB(x) ((x) * 1024)
diff --git a/tools/intel_infoframes.c b/tools/intel_infoframes.c
index 76dd6271..794f423d 100644
--- a/tools/intel_infoframes.c
+++ b/tools/intel_infoframes.c
@@ -30,7 +30,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <getopt.h>
-#include "intel_gpu_tools.h"
+#include "intel_io.h"
 #include "intel_chipset.h"
 #include "drmtest.h"
 
diff --git a/tools/intel_l3_parity.c b/tools/intel_l3_parity.c
index aed36c83..a4b7d738 100644
--- a/tools/intel_l3_parity.c
+++ b/tools/intel_l3_parity.c
@@ -36,7 +36,7 @@
 #include <unistd.h>
 #include <getopt.h>
 #include "intel_chipset.h"
-#include "intel_gpu_tools.h"
+#include "intel_io.h"
 #include "drmtest.h"
 #ifdef HAVE_CONFIG_H
 #include "config.h"
diff --git a/tools/intel_lid.c b/tools/intel_lid.c
index 34960461..7bcb63a7 100644
--- a/tools/intel_lid.c
+++ b/tools/intel_lid.c
@@ -37,7 +37,7 @@
 #include <sys/stat.h>
 #include <sys/types.h>
 
-#include "intel_gpu_tools.h"
+#include "intel_io.h"
 #include "intel_reg.h"
 #include "intel_bios.h"
 #include "intel_chipset.h"
diff --git a/tools/intel_nc_read.c b/tools/intel_nc_read.c
index 0ec3e757..d6d09a81 100644
--- a/tools/intel_nc_read.c
+++ b/tools/intel_nc_read.c
@@ -30,7 +30,7 @@
 #include <stdio.h>
 #include <err.h>
 #include <string.h>
-#include "intel_gpu_tools.h"
+#include "intel_io.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 5700f67f..d7656884 100644
--- a/tools/intel_nc_write.c
+++ b/tools/intel_nc_write.c
@@ -30,7 +30,7 @@
 #include <stdio.h>
 #include <err.h>
 #include <string.h>
-#include "intel_gpu_tools.h"
+#include "intel_io.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 0beece69..b1956610 100644
--- a/tools/intel_opregion_decode.c
+++ b/tools/intel_opregion_decode.c
@@ -37,7 +37,7 @@
 #include <sys/stat.h>
 #include <sys/types.h>
 
-#include "intel_gpu_tools.h"
+#include "intel_io.h"
 #include "drmtest.h"
 
 #define OPREGION_HEADER_OFFSET		0
diff --git a/tools/intel_panel_fitter.c b/tools/intel_panel_fitter.c
index 2e3f6883..5519361e 100644
--- a/tools/intel_panel_fitter.c
+++ b/tools/intel_panel_fitter.c
@@ -30,7 +30,7 @@
 #include <unistd.h>
 #include <stdlib.h>
 #include <string.h>
-#include "intel_gpu_tools.h"
+#include "intel_io.h"
 #include "intel_chipset.h"
 #include "intel_reg.h"
 
diff --git a/tools/intel_perf_counters.c b/tools/intel_perf_counters.c
index c31111e6..e6eafb20 100644
--- a/tools/intel_perf_counters.c
+++ b/tools/intel_perf_counters.c
@@ -45,7 +45,7 @@
 #include "drm.h"
 #include "i915_drm.h"
 #include "drmtest.h"
-#include "intel_gpu_tools.h"
+#include "intel_io.h"
 #include "intel_bufmgr.h"
 #include "intel_batchbuffer.h"
 #include "intel_chipset.h"
diff --git a/tools/intel_punit_read.c b/tools/intel_punit_read.c
index 187bd77c..b0a2697a 100644
--- a/tools/intel_punit_read.c
+++ b/tools/intel_punit_read.c
@@ -30,7 +30,7 @@
 #include <stdio.h>
 #include <err.h>
 #include <string.h>
-#include "intel_gpu_tools.h"
+#include "intel_io.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 c0aa0853..9ffe018d 100644
--- a/tools/intel_punit_write.c
+++ b/tools/intel_punit_write.c
@@ -30,7 +30,7 @@
 #include <stdio.h>
 #include <err.h>
 #include <string.h>
-#include "intel_gpu_tools.h"
+#include "intel_io.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 a2c76419..92b06fa1 100644
--- a/tools/intel_reg_checker.c
+++ b/tools/intel_reg_checker.c
@@ -26,7 +26,7 @@
 #include <err.h>
 #include <string.h>
 #include <stdbool.h>
-#include "intel_gpu_tools.h"
+#include "intel_io.h"
 #include "intel_chipset.h"
 
 static uint32_t devid;
diff --git a/tools/intel_reg_dumper.c b/tools/intel_reg_dumper.c
index 432892ae..04fd6b2d 100644
--- a/tools/intel_reg_dumper.c
+++ b/tools/intel_reg_dumper.c
@@ -33,7 +33,7 @@
 #include <string.h>
 #include <err.h>
 #include <unistd.h>
-#include "intel_gpu_tools.h"
+#include "intel_io.h"
 #include "intel_chipset.h"
 #include "intel_reg.h"
 #include "drmtest.h"
diff --git a/tools/intel_reg_read.c b/tools/intel_reg_read.c
index 961248a0..3b912914 100644
--- a/tools/intel_reg_read.c
+++ b/tools/intel_reg_read.c
@@ -30,7 +30,7 @@
 #include <stdio.h>
 #include <err.h>
 #include <string.h>
-#include "intel_gpu_tools.h"
+#include "intel_io.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 09a95b39..166b68e2 100644
--- a/tools/intel_reg_snapshot.c
+++ b/tools/intel_reg_snapshot.c
@@ -26,7 +26,7 @@
 
 #include <unistd.h>
 #include <assert.h>
-#include "intel_gpu_tools.h"
+#include "intel_io.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 0f73a770..ff4e561e 100644
--- a/tools/intel_reg_write.c
+++ b/tools/intel_reg_write.c
@@ -29,7 +29,7 @@
 #include <stdlib.h>
 #include <stdio.h>
 #include <err.h>
-#include "intel_gpu_tools.h"
+#include "intel_io.h"
 #include "intel_chipset.h"
 
 int main(int argc, char** argv)
diff --git a/tools/intel_stepping.c b/tools/intel_stepping.c
index 626c5bbb..7839ef59 100644
--- a/tools/intel_stepping.c
+++ b/tools/intel_stepping.c
@@ -32,7 +32,7 @@
 #include <pciaccess.h>
 #include <err.h>
 #include "intel_chipset.h"
-#include "intel_gpu_tools.h"
+#include "intel_io.h"
 #include "intel_reg.h"
 
 static void
diff --git a/tools/intel_vga_read.c b/tools/intel_vga_read.c
index 40a9cdc8..e635c59c 100644
--- a/tools/intel_vga_read.c
+++ b/tools/intel_vga_read.c
@@ -31,7 +31,7 @@
 #include <stdio.h>
 #include <unistd.h>
 #include <sys/io.h>
-#include "intel_gpu_tools.h"
+#include "intel_io.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 91af0fe5..4fb09d6a 100644
--- a/tools/intel_vga_write.c
+++ b/tools/intel_vga_write.c
@@ -31,7 +31,7 @@
 #include <stdio.h>
 #include <unistd.h>
 #include <sys/io.h>
-#include "intel_gpu_tools.h"
+#include "intel_io.h"
 #include "intel_chipset.h"
 
 static void write_reg(uint32_t reg, uint8_t val, bool use_mmio)