[Intel-gfx] [PATCH 19/28] lib: rename intel_gpu_tools.h to intel_io.h
Daniel Vetter
daniel.vetter at ffwll.ch
Sun Mar 23 15:18:53 CET 2014
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 at ffwll.ch>
---
benchmarks/intel_upload_blit_large.c | 2 +-
benchmarks/intel_upload_blit_large_gtt.c | 2 +-
benchmarks/intel_upload_blit_large_map.c | 2 +-
benchmarks/intel_upload_blit_small.c | 2 +-
debugger/debug_rdata.c | 2 +-
debugger/eudb.c | 2 +-
.../intel-gpu-tools/intel-gpu-tools-docs.xml | 2 +-
lib/Makefile.sources | 2 +-
lib/drmtest.c | 2 +-
lib/igt_core.c | 2 +-
lib/intel_gpu_tools.h | 87 ----------------------
lib/intel_io.h | 87 ++++++++++++++++++++++
lib/intel_iosf.c | 2 +-
lib/intel_mmio.c | 2 +-
lib/intel_os.c | 2 +-
lib/intel_reg_map.c | 2 +-
lib/ioctl_wrappers.c | 2 +-
lib/rendercopy_gen6.c | 2 +-
lib/rendercopy_gen7.c | 2 +-
lib/rendercopy_gen8.c | 2 +-
lib/rendercopy_i830.c | 2 +-
lib/rendercopy_i915.c | 2 +-
tests/ddi_compute_wrpll.c | 2 +-
tests/drm_vma_limiter.c | 2 +-
tests/drm_vma_limiter_cached.c | 2 +-
tests/drm_vma_limiter_cpu.c | 2 +-
tests/drm_vma_limiter_gtt.c | 2 +-
tests/gem_bad_address.c | 2 +-
tests/gem_bad_batch.c | 2 +-
tests/gem_bad_blit.c | 2 +-
tests/gem_caching.c | 2 +-
tests/gem_concurrent_blit.c | 2 +-
tests/gem_cpu_reloc.c | 2 +-
tests/gem_cs_prefetch.c | 2 +-
tests/gem_cs_tlb.c | 2 +-
tests/gem_ctx_basic.c | 2 +-
tests/gem_double_irq_loop.c | 2 +-
tests/gem_dummy_reloc_loop.c | 2 +-
tests/gem_exec_bad_domains.c | 2 +-
tests/gem_exec_blt.c | 2 +-
tests/gem_exec_faulting_reloc.c | 2 +-
tests/gem_exec_nop.c | 2 +-
tests/gem_fenced_exec_thrash.c | 2 +-
tests/gem_gtt_cpu_tlb.c | 2 +-
tests/gem_hang.c | 2 +-
tests/gem_hangcheck_forcewake.c | 2 +-
tests/gem_linear_blits.c | 2 +-
tests/gem_media_fill.c | 2 +-
tests/gem_non_secure_batch.c | 2 +-
tests/gem_partial_pwrite_pread.c | 2 +-
tests/gem_persistent_relocs.c | 2 +-
tests/gem_pin.c | 2 +-
tests/gem_pipe_control_store_loop.c | 2 +-
tests/gem_pread_after_blit.c | 2 +-
tests/gem_pwrite_pread.c | 2 +-
tests/gem_reloc_overflow.c | 2 +-
tests/gem_reloc_vs_gpu.c | 2 +-
tests/gem_render_copy.c | 2 +-
tests/gem_render_linear_blits.c | 2 +-
tests/gem_render_tiled_blits.c | 2 +-
tests/gem_reset_stats.c | 2 +-
tests/gem_ring_sync_loop.c | 2 +-
tests/gem_ringfill.c | 2 +-
tests/gem_seqno_wrap.c | 2 +-
tests/gem_set_tiling_vs_blt.c | 2 +-
tests/gem_set_tiling_vs_gtt.c | 2 +-
tests/gem_set_tiling_vs_pwrite.c | 2 +-
tests/gem_storedw_batches_loop.c | 2 +-
tests/gem_storedw_loop_blt.c | 2 +-
tests/gem_storedw_loop_bsd.c | 2 +-
tests/gem_storedw_loop_render.c | 2 +-
tests/gem_storedw_loop_vebox.c | 2 +-
tests/gem_stress.c | 2 +-
tests/gem_tiled_blits.c | 2 +-
tests/gem_tiled_fence_blits.c | 2 +-
tests/gem_tiled_partial_pwrite_pread.c | 2 +-
tests/gem_tiled_pread.c | 2 +-
tests/gem_tiled_pread_pwrite.c | 2 +-
tests/gem_tiled_swapping.c | 2 +-
tests/gem_tiling_max_stride.c | 2 +-
tests/gem_unfence_active_buffers.c | 2 +-
tests/gem_unref_active_buffers.c | 2 +-
tests/gem_vmap_blits.c | 2 +-
tests/gem_wait_render_timeout.c | 2 +-
tests/gem_write_read_ring_switch.c | 2 +-
tests/gen3_mixed_blits.c | 2 +-
tests/gen3_render_linear_blits.c | 2 +-
tests/gen3_render_mixed_blits.c | 2 +-
tests/gen3_render_tiledx_blits.c | 2 +-
tests/gen3_render_tiledy_blits.c | 2 +-
tests/gen7_forcewake_mt.c | 2 +-
tests/kms_render.c | 2 +-
tests/kms_setmode.c | 2 +-
tests/pm_lpsp.c | 2 +-
tests/pm_pc8.c | 2 +-
tests/pm_rps.c | 2 +-
tests/prime_nv_api.c | 2 +-
tests/prime_nv_pcopy.c | 2 +-
tests/prime_nv_test.c | 2 +-
tests/prime_udl.c | 2 +-
tools/intel_audio_dump.c | 2 +-
tools/intel_backlight.c | 2 +-
tools/intel_bios_reader.c | 2 +-
tools/intel_dpio_read.c | 2 +-
tools/intel_dpio_write.c | 2 +-
tools/intel_error_decode.c | 2 +-
tools/intel_forcewaked.c | 2 +-
tools/intel_framebuffer_dump.c | 2 +-
tools/intel_gpu_time.c | 2 +-
tools/intel_gpu_top.c | 2 +-
tools/intel_gtt.c | 2 +-
tools/intel_infoframes.c | 2 +-
tools/intel_l3_parity.c | 2 +-
tools/intel_lid.c | 2 +-
tools/intel_nc_read.c | 2 +-
tools/intel_nc_write.c | 2 +-
tools/intel_opregion_decode.c | 2 +-
tools/intel_panel_fitter.c | 2 +-
tools/intel_perf_counters.c | 2 +-
tools/intel_punit_read.c | 2 +-
tools/intel_punit_write.c | 2 +-
tools/intel_reg_checker.c | 2 +-
tools/intel_reg_dumper.c | 2 +-
tools/intel_reg_read.c | 2 +-
tools/intel_reg_snapshot.c | 2 +-
tools/intel_reg_write.c | 2 +-
tools/intel_stepping.c | 2 +-
tools/intel_vga_read.c | 2 +-
tools/intel_vga_write.c | 2 +-
129 files changed, 214 insertions(+), 214 deletions(-)
delete mode 100644 lib/intel_gpu_tools.h
create mode 100644 lib/intel_io.h
diff --git a/benchmarks/intel_upload_blit_large.c b/benchmarks/intel_upload_blit_large.c
index 40bdbcfb8fe3..e12a2b1122ff 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 4910710223a3..c06c56c66cb1 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 93433fc95db1..18d2dfe41d49 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 e2f804bbdf06..05590b13afe7 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 fc7682b02581..61d82d9e51ad 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 4cbc2d7b8822..0e810db10aa8 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 0f117f71c9f9..bf196f27dfd4 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 e3942aceab2d..3e2a4b5b9c55 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 c6f7bdebe006..3c72ac8dba2c 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 81e37313fb45..cd094c431e3d 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_gpu_tools.h
deleted file mode 100644
index 591fd3f446c3..000000000000
--- a/lib/intel_gpu_tools.h
+++ /dev/null
@@ -1,87 +0,0 @@
-/*
- * Copyright © 2009 Intel Corporation
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice (including the next
- * paragraph) shall be included in all copies or substantial portions of the
- * Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
- * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
- * DEALINGS IN THE SOFTWARE.
- *
- * Authors:
- * Eric Anholt <eric at anholt.net>
- *
- */
-
-#ifndef INTEL_GPU_TOOLS_H
-#define INTEL_GPU_TOOLS_H
-
-#include <stdint.h>
-#include <pciaccess.h>
-
-/* register access helpers from intel_mmio.c */
-extern void *mmio;
-void intel_get_mmio(struct pci_device *pci_dev);
-void intel_map_file(char *);
-
-int intel_register_access_init(struct pci_device *pci_dev, int safe);
-void intel_register_access_fini(void);
-uint32_t intel_register_read(uint32_t reg);
-void intel_register_write(uint32_t reg, uint32_t val);
-int intel_register_access_needs_fakewake(void);
-
-static inline uint32_t
-INREG(uint32_t reg)
-{
- return *(volatile uint32_t *)((volatile char *)mmio + reg);
-}
-
-static inline void
-OUTREG(uint32_t reg, uint32_t val)
-{
- *(volatile uint32_t *)((volatile char *)mmio + reg) = val;
-}
-
-/* sideband access functions from intel_iosf.c */
-uint32_t intel_dpio_reg_read(uint32_t reg, int phy);
-void intel_dpio_reg_write(uint32_t reg, uint32_t val, int phy);
-
-int intel_punit_read(uint8_t addr, uint32_t *val);
-int intel_punit_write(uint8_t addr, uint32_t val);
-int intel_nc_read(uint8_t addr, uint32_t *val);
-int intel_nc_write(uint8_t addr, uint32_t val);
-
-/* register maps from intel_reg_map.c */
-#define INTEL_RANGE_RSVD (0<<0) /* Shouldn't be read or written */
-#define INTEL_RANGE_READ (1<<0)
-#define INTEL_RANGE_WRITE (1<<1)
-#define INTEL_RANGE_RW (INTEL_RANGE_READ | INTEL_RANGE_WRITE)
-#define INTEL_RANGE_END (1<<31)
-
-struct intel_register_range {
- uint32_t base;
- uint32_t size;
- uint32_t flags;
-};
-
-struct intel_register_map {
- struct intel_register_range *map;
- uint32_t top;
- uint32_t alignment_mask;
-};
-struct intel_register_map intel_get_register_map(uint32_t devid);
-struct intel_register_range *intel_get_register_range(struct intel_register_map map, uint32_t offset, uint32_t mode);
-
-#endif /* INTEL_GPU_TOOLS_H */
diff --git a/lib/intel_io.h b/lib/intel_io.h
new file mode 100644
index 000000000000..591fd3f446c3
--- /dev/null
+++ b/lib/intel_io.h
@@ -0,0 +1,87 @@
+/*
+ * Copyright © 2009 Intel Corporation
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * DEALINGS IN THE SOFTWARE.
+ *
+ * Authors:
+ * Eric Anholt <eric at anholt.net>
+ *
+ */
+
+#ifndef INTEL_GPU_TOOLS_H
+#define INTEL_GPU_TOOLS_H
+
+#include <stdint.h>
+#include <pciaccess.h>
+
+/* register access helpers from intel_mmio.c */
+extern void *mmio;
+void intel_get_mmio(struct pci_device *pci_dev);
+void intel_map_file(char *);
+
+int intel_register_access_init(struct pci_device *pci_dev, int safe);
+void intel_register_access_fini(void);
+uint32_t intel_register_read(uint32_t reg);
+void intel_register_write(uint32_t reg, uint32_t val);
+int intel_register_access_needs_fakewake(void);
+
+static inline uint32_t
+INREG(uint32_t reg)
+{
+ return *(volatile uint32_t *)((volatile char *)mmio + reg);
+}
+
+static inline void
+OUTREG(uint32_t reg, uint32_t val)
+{
+ *(volatile uint32_t *)((volatile char *)mmio + reg) = val;
+}
+
+/* sideband access functions from intel_iosf.c */
+uint32_t intel_dpio_reg_read(uint32_t reg, int phy);
+void intel_dpio_reg_write(uint32_t reg, uint32_t val, int phy);
+
+int intel_punit_read(uint8_t addr, uint32_t *val);
+int intel_punit_write(uint8_t addr, uint32_t val);
+int intel_nc_read(uint8_t addr, uint32_t *val);
+int intel_nc_write(uint8_t addr, uint32_t val);
+
+/* register maps from intel_reg_map.c */
+#define INTEL_RANGE_RSVD (0<<0) /* Shouldn't be read or written */
+#define INTEL_RANGE_READ (1<<0)
+#define INTEL_RANGE_WRITE (1<<1)
+#define INTEL_RANGE_RW (INTEL_RANGE_READ | INTEL_RANGE_WRITE)
+#define INTEL_RANGE_END (1<<31)
+
+struct intel_register_range {
+ uint32_t base;
+ uint32_t size;
+ uint32_t flags;
+};
+
+struct intel_register_map {
+ struct intel_register_range *map;
+ uint32_t top;
+ uint32_t alignment_mask;
+};
+struct intel_register_map intel_get_register_map(uint32_t devid);
+struct intel_register_range *intel_get_register_range(struct intel_register_map map, uint32_t offset, uint32_t mode);
+
+#endif /* INTEL_GPU_TOOLS_H */
diff --git a/lib/intel_iosf.c b/lib/intel_iosf.c
index b7b4ce23626c..ea7a320a5647 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 3e1aac740a50..444e44507eac 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 4b72f5175a30..14dda1474d5d 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 ec63d79edfb9..402274baabb9 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 5806f2a13bd8..24185491d4b6 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 a908ae6bbe38..d806ceff5470 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 75e0571618fc..1dc639f318a7 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 ef19ebf43a60..424afa0aefa8 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 5ebd31a4677a..f0235a538fda 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 b63c5cc4f03d..1acf9da31799 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 c1db6c08de5b..02a96547443b 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 f14ced8c85b6..e1381fe3d3bc 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 7c40541c5ff5..3b41caad91a8 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 4da4673752cd..e17a679d9492 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 283bf6b47df8..303e86da2a95 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 58819357bf2a..f8fda90d546c 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 5bb08b442b5c..33b3241f82e6 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 ec414eaff7dc..9c031179a073 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 da6f2d8f02f7..3d51f2617737 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 29f42c7dc2d6..03acf89c0c90 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 77d9109eef2c..e0276e7f9a78 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 842e4276dd84..ffa80f36fca1 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 7d5c99dc67dd..8f7bc61cd40b 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 3dbef2bd767c..3e9b68806c6f 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 f5c762962a43..ee9846c39ba7 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 7c9da637e89c..a61b59b0ea9e 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 0000e9edd144..6fb9edb63dbe 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 6c3ea37d60bb..ee979e7f812c 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 51e5b6ed1ed3..acd703b60ded 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 28ec66b3b151..eaece7967f75 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 2ba85f2bcb5a..3194e340cf2c 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 c087a37934a7..953070c0c63d 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 5b1f5dc81be1..656d9cd1f67a 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 d1bf000efb7a..64f839f5de46 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 a7e398fb7d95..1b6742288220 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 68bbdf23adf0..cb081d8bde2b 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 1d96222dc58b..6a73e84edba4 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 c246537341c8..a43a2b645fa0 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 1a705fad8fff..1795160bcd1b 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 e57ddcc4c740..9572d2886748 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 41bfc1b0e40a..c95c2bdfa28e 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 f263286c0f49..6c3f8227e9ee 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 c3314e48bc89..7a0cdf39f0ee 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 98b7dd4a7b0c..06a315fd45b6 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 07c79b33d937..8e8018762597 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 54f971d127b7..12ac18d31251 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 ac2b29b00d14..14a3ae7e7a41 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 8481e51d3bda..bee063fcc179 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 90befd70a527..a6d4edc72323 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 5010d3562142..d4e7e2a82554 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 716ff5692cf7..88c8a8eeef69 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 30d1a8687090..a557c9857ed4 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 1ad0e5c1e91b..e2f3f9751e18 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 abe096396d57..384a85eab6b3 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 d07ebafc3fa6..cc818f144731 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 f07085c46a01..90f004ed3d59 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 b242b292017a..7cbf86d3d2d8 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 482e276b0158..c3ab32257713 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 7cbc0a80d08c..43ca09596926 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 872d4b2aa56b..c7136215c295 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 d6434bcc5b63..bf3cde762142 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 00b695549b35..09be42efea2f 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 3dfcf0039dba..7cefca0b3afa 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 322cca9d8794..26fc145da8d1 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 6f104a6ca38b..73ed0bf657ee 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 06c32fcc1fde..08176f3d700d 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 28d21d458e68..fd9b40f3285c 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 ded965aef0ef..4d0553d4ad5b 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 9ccabe9fd29b..219393123f12 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 8906705756ea..cdc30990f228 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 157d67460e6c..430338b73b14 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 d4c12fee17c8..b0b77adc0c38 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 cd235c95c190..f19a7bef6e48 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 64041a0ec29b..80b626cfe91b 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 eed3ba5e47f1..3e2d1a4804bb 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 ac5452a8cde7..09275f73f401 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 1b2a00c50880..574282890a73 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 803054138002..1765dca57e22 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 03eb6e92625f..fdc34ced512a 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 7bff958b876c..2179e65d66ee 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 4c1a5676a7a0..703e93264e88 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 1dc7a73f5dae..87397055558b 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 5a1e74700760..3004c32eb94a 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 1f4b284cd42a..ce65edd75c1c 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 c510c1cfe3bb..73c0a0d24f5f 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 3f3814afc786..7fa2e34cd04f 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 ee54e7a6eb6c..8211cd6f030e 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 96661fcb501f..62b381a37d86 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 9762b4f7a195..26023743307b 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 e2591847f548..b866ec8efaee 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 8eb46f3dead6..173772bf91d9 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 2196041a6ac3..09f0376485bc 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 c3c682a654c8..15c79efe7dfe 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 b1d51b74a6fc..1eeff0714395 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 b4e7b5cc6319..01ca02530d10 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 a254324c601a..624a96136137 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 0b8ca9e4c578..4096f1c5486f 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 ccbe9736db23..a016bc9bdecc 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 f3d1c3082052..9604a54792d3 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 76dd6271e1fd..794f423d2161 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 aed36c83b73b..a4b7d738e0b2 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 34960461382c..7bcb63a772fd 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 0ec3e75764b9..d6d09a81e5c4 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 5700f67f3f2f..d76568847f86 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 0beece699a1d..b19566108ed7 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 2e3f6883d9c5..5519361e6c8c 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 c31111e60bbb..e6eafb200ab1 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 187bd77c7b0c..b0a2697addb9 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 c0aa08530353..9ffe018d8f5e 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 a2c76419fbcd..92b06fa152d4 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 432892aec3ac..04fd6b2d8b8c 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 961248a02db4..3b9129148878 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 09a95b3932c4..166b68e25271 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 0f73a7706ece..ff4e561ee4ab 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 626c5bbb0010..7839ef5923e9 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 40a9cdc869ca..e635c59cda3b 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 91af0fe5017a..4fb09d6a247a 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)
--
1.8.5.2
More information about the Intel-gfx
mailing list