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>

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

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

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

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. */

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 {

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"

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">

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		\

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"

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"

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

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"
 

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"
 

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[] = {

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"

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"

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"

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"

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"

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"

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

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;

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;

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;

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;

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;

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;

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;

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"
 
 /*

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

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;

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;

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)

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 */

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"
 

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"
 

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

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
 

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

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)
 

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

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)
 

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;

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"
 
 /*

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

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

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;

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

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"
 
 /*

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)

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;

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;

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
 

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.

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"
 
 /*

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

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

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

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)

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"
 

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;

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;

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;

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)

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)

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;

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;

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;

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;

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)

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

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;

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;

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

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

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

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

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)

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;

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;

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")

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

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)

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"

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"

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"

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"

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"

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

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"

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

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

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"

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"

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"

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"

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"

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"

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"