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>
diff --git a/benchmarks/intel_upload_blit_large.c b/benchmarks/intel_upload_blit_large.c
index 40bdbcf..e12a2b1 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 4910710..c06c56c 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 93433fc..18d2dfe 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 e2f804b..05590b1 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 fc7682b..61d82d9 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 4cbc2d7..0e810db 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 0f117f7..bf196f2 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 e3942ac..3e2a4b5 100644
--- a/lib/Makefile.sources
+++ b/lib/Makefile.sources
@@ -16,7 +16,7 @@
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 c6f7bde..3c72ac8 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 81e3731..cd094c4 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
similarity index 100%
rename from lib/intel_gpu_tools.h
rename to lib/intel_io.h
diff --git a/lib/intel_iosf.c b/lib/intel_iosf.c
index b7b4ce2..ea7a320 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 3e1aac7..444e445 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 4b72f51..14dda14 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 ec63d79..402274b 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 5806f2a..2418549 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 a908ae6..d806cef 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 75e0571..1dc639f 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 ef19ebf..424afa0 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 5ebd31a..f0235a5 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 b63c5cc..1acf9da 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 c1db6c0..02a9654 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 f14ced8..e1381fe 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 7c40541..3b41caa 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 4da4673..e17a679 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 283bf6b..303e86d 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 5881935..f8fda90 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 5bb08b4..33b3241 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 ec414ea..9c03117 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 da6f2d8..3d51f26 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 29f42c7..03acf89 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 77d9109..e0276e7 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 842e427..ffa80f3 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 7d5c99d..8f7bc61 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 3dbef2b..3e9b688 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 f5c7629..ee9846c 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 7c9da63..a61b59b 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 0000e9e..6fb9edb 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 6c3ea37..ee979e7 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 51e5b6e..acd703b 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 28ec66b..eaece79 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 2ba85f2..3194e34 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 c087a37..953070c 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 5b1f5dc..656d9cd 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 d1bf000..64f839f 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 a7e398f..1b67422 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 68bbdf2..cb081d8 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 1d96222..6a73e84 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 c246537..a43a2b6 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 1a705fa..1795160 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 e57ddcc..9572d28 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 41bfc1b..c95c2bd 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 f263286..6c3f822 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 c3314e4..7a0cdf3 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 98b7dd4..06a315f 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 07c79b3..8e80187 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 54f971d..12ac18d 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 ac2b29b..14a3ae7 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 8481e51..bee063f 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 90befd7..a6d4edc 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 5010d35..d4e7e2a 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 716ff56..88c8a8e 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 30d1a86..a557c98 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 1ad0e5c..e2f3f97 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 abe0963..384a85e 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 d07ebaf..cc818f1 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 f07085c..90f004e 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 b242b29..7cbf86d 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 482e276..c3ab322 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 7cbc0a8..43ca095 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 872d4b2..c713621 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 d6434bc..bf3cde7 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 00b6955..09be42e 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 3dfcf00..7cefca0 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 322cca9..26fc145 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 6f104a6..73ed0bf 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 06c32fc..08176f3 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 28d21d4..fd9b40f 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 ded965a..4d0553d 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 9ccabe9..2193931 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 8906705..cdc3099 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 157d674..430338b 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 d4c12fe..b0b77ad 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 cd235c9..f19a7be 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 64041a0..80b626c 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 eed3ba5..3e2d1a4 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 ac5452a..09275f7 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 1b2a00c..5742828 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 8030541..1765dca 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 03eb6e9..fdc34ce 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 7bff958..2179e65 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 4c1a567..703e932 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 1dc7a73..8739705 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 5a1e747..3004c32 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 1f4b284..ce65edd 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 c510c1c..73c0a0d 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 3f3814a..7fa2e34 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 ee54e7a..8211cd6 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 96661fc..62b381a 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 9762b4f..2602374 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 e259184..b866ec8 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 8eb46f3..173772b 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 2196041..09f0376 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 c3c682a..15c79ef 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 b1d51b7..1eeff07 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 b4e7b5c..01ca025 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 a254324..624a961 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 0b8ca9e..4096f1c 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 ccbe973..a016bc9 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 f3d1c30..9604a54 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 76dd627..794f423 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 aed36c8..a4b7d73 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 3496046..7bcb63a 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 0ec3e75..d6d09a8 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 5700f67..d765688 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 0beece6..b195661 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 2e3f688..5519361 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 c31111e..e6eafb2 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 187bd77..b0a2697 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 c0aa085..9ffe018 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 a2c7641..92b06fa 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 432892a..04fd6b2 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 961248a..3b91291 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 09a95b3..166b68e 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 0f73a77..ff4e561 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 626c5bb..7839ef5 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 40a9cdc..e635c59 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 91af0fe..4fb09d6 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)