Commit c03c6ceb authored by Daniel Vetter's avatar Daniel Vetter

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's avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent 254f19ba
......@@ -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
......
......@@ -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
......
......@@ -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
......
......@@ -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. */
......
......@@ -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 {
......
......@@ -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"
......
......@@ -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">
......
......@@ -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 \
......
......@@ -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"
......
......@@ -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"
......
......@@ -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
......
......@@ -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"
......
......@@ -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"
......
......@@ -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[] = {
......
......@@ -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"
......
......@@ -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"
......
......@@ -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"
......
......@@ -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"
......
......@@ -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"
......
......@@ -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"
......
......@@ -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
......
......@@ -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;
......
......@@ -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;
......
......@@ -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;
......
......@@ -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;
......
......@@ -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;
......
......@@ -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;
......
......@@ -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;
......
......@@ -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"
/*
......
......@@ -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
......
......@@ -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;
......
......@@ -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;
......
......@@ -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)
......
......@@ -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 */
......
......@@ -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"
......
......@@ -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"
......
......@@ -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
......
......@@ -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
......
......@@ -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
......
......@@ -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)
......
......@@ -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
......
......@@ -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)
......
......@@ -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;
......
......@@ -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"
/*
......
......@@ -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
......
......@@ -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
......
......@@ -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;
......
......@@ -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
......
......@@ -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"
/*
......
......@@ -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)
......
......@@ -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;
......
......@@ -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;
......
......@@ -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
......
......@@ -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.
......
......@@ -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"
/*
......
......@@ -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
......
......@@ -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
......
......@@ -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
......
......@@ -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)
......
......@@ -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"
......
......@@ -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;
......
......@@ -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;
......
......@@ -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;
......
......@@ -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)
......
......@@ -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)
......
......@@ -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;
......
......@@ -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;
......
......@@ -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;
......
......@@ -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;
......
......@@ -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)
......
......@@ -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
......
......@@ -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;
......
......@@ -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;
......
......@@ -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
...