@@ -59,6 +59,7 @@
#include "intel_bufmgr.h"
#include "intel_batchbuffer.h"
#include "intel_gpu_tools.h"
+#include "intel_chipset.h"
#define OBJECT_WIDTH 1280
#define OBJECT_HEIGHT 720
@@ -59,6 +59,7 @@
#include "intel_bufmgr.h"
#include "intel_batchbuffer.h"
#include "intel_gpu_tools.h"
+#include "intel_chipset.h"
#define OBJECT_WIDTH 1280
#define OBJECT_HEIGHT 720
@@ -62,6 +62,7 @@
#include "intel_bufmgr.h"
#include "intel_batchbuffer.h"
#include "intel_gpu_tools.h"
+#include "intel_chipset.h"
#define OBJECT_WIDTH 1280
#define OBJECT_HEIGHT 720
@@ -55,6 +55,7 @@
#include "intel_bufmgr.h"
#include "intel_batchbuffer.h"
#include "intel_gpu_tools.h"
+#include "intel_chipset.h"
/* Happens to be 128k, the size of the VBOs used by i965's Mesa driver. */
#define OBJECT_WIDTH 256
@@ -47,10 +47,9 @@
#include "drmtest.h"
#include "igt_kms.h"
-#if defined(DRM_IOCTL_MODE_ADDFB2) && defined(DRM_I915_SET_SPRITE_COLORKEY)
-#define TEST_PLANES 1
-#include "drm_fourcc.h"
-#endif
+#include <drm_fourcc.h>
+
+#include "ioctl_wrappers.h"
/*
* Mode setting with the kernel interfaces is a bit of a chore.
@@ -56,6 +56,7 @@
#include "../version.h"
#include "config.h"
#include "intel_reg.h"
+#include "ioctl_wrappers.h"
/* This file contains a bunch of wrapper functions to directly use gem ioctls.
* Mostly useful to write kernel tests. */
@@ -33,18 +33,11 @@
#include <unistd.h>
#include <errno.h>
#include <stdbool.h>
-#include <setjmp.h>
#include <sys/mman.h>
#include "xf86drm.h"
#include "xf86drmMode.h"
-#include "i915_drm.h"
#include "intel_batchbuffer.h"
-#include "intel_chipset.h"
-#include "intel_gpu_tools.h"
-
-#include "ioctl_wrappers.h"
-#include "igt_core.h"
#ifdef ANDROID
#ifndef HAVE_MMAP64
@@ -22,6 +22,7 @@
*
*/
+#include <inttypes.h>
#include <sys/stat.h>
#include <sys/mount.h>
#include <errno.h>
@@ -34,6 +34,7 @@
#include "drmtest.h"
#include "igt_kms.h"
+#include "ioctl_wrappers.h"
/* helpers to create nice-looking framebuffers */
static int create_bo_for_fb(int fd, int width, int height, int bpp,
@@ -30,6 +30,11 @@
#ifndef IOCTL_WRAPPERS_H
#define IOCTL_WRAPPERS_H
+#include <stdint.h>
+#include <stdbool.h>
+#include <intel_bufmgr.h>
+#include <i915_drm.h>
+
/* libdrm interfacing */
drm_intel_bo * gem_handle_to_libdrm_bo(drm_intel_bufmgr *bufmgr, int fd,
const char *name, uint32_t handle);
@@ -16,6 +16,7 @@
#include "intel_bufmgr.h"
#include "intel_batchbuffer.h"
#include "intel_gpu_tools.h"
+#include "intel_chipset.h"
#include "rendercopy.h"
#include "gen7_render.h"
#include "intel_reg.h"
@@ -40,7 +40,7 @@
# include <sys/syscall.h>
#include "drm.h"
-#include "i915_drm.h"
+#include "ioctl_wrappers.h"
#include "drmtest.h"
/* Checks whether the thread id is the current thread */
@@ -33,11 +33,12 @@
#include <sys/stat.h>
#include <sys/time.h>
#include "drm.h"
-#include "i915_drm.h"
+#include "ioctl_wrappers.h"
#include "drmtest.h"
#include "intel_bufmgr.h"
#include "intel_batchbuffer.h"
#include "intel_gpu_tools.h"
+#include "intel_chipset.h"
static drm_intel_bufmgr *bufmgr;
struct intel_batchbuffer *batch;
@@ -33,11 +33,12 @@
#include <sys/stat.h>
#include <sys/time.h>
#include "drm.h"
-#include "i915_drm.h"
+#include "ioctl_wrappers.h"
#include "drmtest.h"
#include "intel_bufmgr.h"
#include "intel_batchbuffer.h"
#include "intel_gpu_tools.h"
+#include "intel_chipset.h"
static drm_intel_bufmgr *bufmgr;
struct intel_batchbuffer *batch;
@@ -33,11 +33,12 @@
#include <sys/stat.h>
#include <sys/time.h>
#include "drm.h"
-#include "i915_drm.h"
+#include "ioctl_wrappers.h"
#include "drmtest.h"
#include "intel_bufmgr.h"
#include "intel_batchbuffer.h"
#include "intel_gpu_tools.h"
+#include "intel_chipset.h"
static drm_intel_bufmgr *bufmgr;
struct intel_batchbuffer *batch;
@@ -33,11 +33,12 @@
#include <sys/stat.h>
#include <sys/time.h>
#include "drm.h"
-#include "i915_drm.h"
+#include "ioctl_wrappers.h"
#include "drmtest.h"
#include "intel_bufmgr.h"
#include "intel_batchbuffer.h"
#include "intel_gpu_tools.h"
+#include "intel_chipset.h"
static drm_intel_bufmgr *bufmgr;
struct intel_batchbuffer *batch;
@@ -35,7 +35,7 @@
#include <sys/stat.h>
#include <sys/ioctl.h>
#include "drm.h"
-#include "i915_drm.h"
+#include "ioctl_wrappers.h"
#include "drmtest.h"
#include "igt_debugfs.h"
@@ -35,9 +35,10 @@
#include <sys/stat.h>
#include <sys/time.h>
#include "drm.h"
-#include "i915_drm.h"
+#include "ioctl_wrappers.h"
#include "drmtest.h"
#include "intel_bufmgr.h"
+#include "intel_chipset.h"
#include "intel_batchbuffer.h"
#include "intel_gpu_tools.h"
@@ -35,10 +35,11 @@
#include <sys/stat.h>
#include <sys/time.h>
#include "drm.h"
-#include "i915_drm.h"
+#include "ioctl_wrappers.h"
#include "drmtest.h"
#include "intel_bufmgr.h"
#include "intel_batchbuffer.h"
+#include "intel_chipset.h"
#include "intel_gpu_tools.h"
static drm_intel_bufmgr *bufmgr;
@@ -50,10 +50,11 @@
#include <sys/stat.h>
#include <sys/time.h>
#include "drm.h"
-#include "i915_drm.h"
+#include "ioctl_wrappers.h"
#include "drmtest.h"
#include "intel_bufmgr.h"
#include "intel_batchbuffer.h"
+#include "intel_chipset.h"
#include "intel_gpu_tools.h"
static drm_intel_bufmgr *bufmgr;
@@ -35,7 +35,7 @@
#include <sys/stat.h>
#include <sys/ioctl.h>
#include "drm.h"
-#include "i915_drm.h"
+#include "ioctl_wrappers.h"
#include "drmtest.h"
/*
@@ -35,7 +35,7 @@
#include <sys/stat.h>
#include <sys/ioctl.h>
#include "drm.h"
-#include "i915_drm.h"
+#include "ioctl_wrappers.h"
#include "drmtest.h"
static void
@@ -35,11 +35,12 @@
#include <sys/stat.h>
#include <sys/time.h>
#include "drm.h"
-#include "i915_drm.h"
+#include "ioctl_wrappers.h"
#include "drmtest.h"
#include "intel_bufmgr.h"
#include "intel_batchbuffer.h"
#include "intel_gpu_tools.h"
+#include "intel_chipset.h"
/*
* Testcase: snoop consistency when touching partial cachelines
@@ -38,8 +38,9 @@
#include <sys/ioctl.h>
#include <sys/time.h>
#include "drm.h"
-#include "i915_drm.h"
+#include "ioctl_wrappers.h"
#include "drmtest.h"
+#include "intel_chipset.h"
#define OBJECT_SIZE 1024*1024*4
@@ -45,11 +45,12 @@
#include <sys/time.h>
#include <sys/wait.h>
#include "drm.h"
-#include "i915_drm.h"
+#include "ioctl_wrappers.h"
#include "drmtest.h"
#include "intel_bufmgr.h"
#include "intel_batchbuffer.h"
#include "intel_gpu_tools.h"
+#include "intel_chipset.h"
static void
prw_set_bo(drm_intel_bo *bo, uint32_t val, int width, int height)
@@ -54,11 +54,12 @@
#include <sys/stat.h>
#include <sys/time.h>
#include "drm.h"
-#include "i915_drm.h"
+#include "ioctl_wrappers.h"
#include "drmtest.h"
#include "intel_bufmgr.h"
#include "intel_batchbuffer.h"
#include "intel_gpu_tools.h"
+#include "intel_chipset.h"
static uint32_t use_blt;
@@ -44,11 +44,12 @@
#include <sys/stat.h>
#include <sys/time.h>
#include "drm.h"
-#include "i915_drm.h"
+#include "ioctl_wrappers.h"
#include "drmtest.h"
#include "intel_bufmgr.h"
#include "intel_batchbuffer.h"
#include "intel_gpu_tools.h"
+#include "intel_chipset.h"
static drm_intel_bufmgr *bufmgr;
struct intel_batchbuffer *batch;
@@ -47,7 +47,7 @@
#include <sys/ioctl.h>
#include <sys/time.h>
#include "drm.h"
-#include "i915_drm.h"
+#include "ioctl_wrappers.h"
#include "drmtest.h"
#include "intel_gpu_tools.h"
@@ -31,7 +31,7 @@
#include <stdio.h>
#include <string.h>
-#include "i915_drm.h"
+#include "ioctl_wrappers.h"
#include "drmtest.h"
struct local_drm_i915_context_destroy {
@@ -42,7 +42,7 @@
#include <sys/ioctl.h>
#include <sys/time.h>
#include "drm.h"
-#include "i915_drm.h"
+#include "ioctl_wrappers.h"
#include "drmtest.h"
/* Copied from gem_exec_nop.c */
@@ -41,11 +41,12 @@
#include <sys/time.h>
#include <getopt.h>
#include "drm.h"
-#include "i915_drm.h"
+#include "ioctl_wrappers.h"
#include "drmtest.h"
#include "intel_bufmgr.h"
#include "intel_batchbuffer.h"
#include "intel_gpu_tools.h"
+#include "intel_chipset.h"
/* options */
int num_contexts = 10;
@@ -27,7 +27,7 @@
#include <stdio.h>
#include <string.h>
-#include "i915_drm.h"
+#include "ioctl_wrappers.h"
#include "drmtest.h"
struct local_drm_i915_gem_context_create {
@@ -41,7 +41,7 @@
#include <sys/ioctl.h>
#include <sys/time.h>
#include "drm.h"
-#include "i915_drm.h"
+#include "ioctl_wrappers.h"
#include "drmtest.h"
struct local_drm_i915_gem_context_destroy {
@@ -34,12 +34,13 @@
#include <sys/stat.h>
#include <sys/time.h>
#include "drm.h"
-#include "i915_drm.h"
+#include "ioctl_wrappers.h"
#include "drmtest.h"
#include "intel_bufmgr.h"
#include "intel_batchbuffer.h"
#include "intel_gpu_tools.h"
#include "i830_reg.h"
+#include "intel_chipset.h"
static drm_intel_bufmgr *bufmgr;
struct intel_batchbuffer *batch;
@@ -34,12 +34,13 @@
#include <sys/stat.h>
#include <sys/time.h>
#include "drm.h"
-#include "i915_drm.h"
+#include "ioctl_wrappers.h"
#include "drmtest.h"
#include "intel_bufmgr.h"
#include "intel_batchbuffer.h"
#include "intel_gpu_tools.h"
#include "i830_reg.h"
+#include "intel_chipset.h"
#define LOCAL_I915_EXEC_VEBOX (4<<0)
@@ -42,8 +42,9 @@
#include <sys/ioctl.h>
#include <sys/time.h>
#include "drm.h"
-#include "i915_drm.h"
+#include "ioctl_wrappers.h"
#include "drmtest.h"
+#include "intel_chipset.h"
#define HEIGHT 256
#define WIDTH 1024
@@ -42,8 +42,9 @@
#include <sys/ioctl.h>
#include <sys/time.h>
#include "drm.h"
-#include "i915_drm.h"
+#include "ioctl_wrappers.h"
#include "drmtest.h"
+#include "intel_chipset.h"
#include "eviction_common.c"
@@ -34,11 +34,12 @@
#include <sys/stat.h>
#include <sys/time.h>
#include "drm.h"
-#include "i915_drm.h"
+#include "ioctl_wrappers.h"
#include "drmtest.h"
#include "intel_bufmgr.h"
#include "intel_batchbuffer.h"
#include "intel_gpu_tools.h"
+#include "intel_chipset.h"
/* Testcase: Test whether the kernel rejects relocations with non-gpu domains
*
@@ -44,7 +44,7 @@
#include <sys/ioctl.h>
#include <sys/time.h>
#include "drm.h"
-#include "i915_drm.h"
+#include "ioctl_wrappers.h"
#include "drmtest.h"
#define BATCH_SIZE (1024*1024)
@@ -37,7 +37,7 @@
#include <sys/ioctl.h>
#include <sys/time.h>
#include "drm.h"
-#include "i915_drm.h"
+#include "ioctl_wrappers.h"
#include "drmtest.h"
#include "intel_chipset.h"
#include "intel_gpu_tools.h"
@@ -37,7 +37,7 @@
#include <sys/ioctl.h>
#include <sys/time.h>
#include "drm.h"
-#include "i915_drm.h"
+#include "ioctl_wrappers.h"
#include "drmtest.h"
#include "intel_chipset.h"
#include "intel_gpu_tools.h"
@@ -36,7 +36,7 @@
#include <sys/stat.h>
#include <sys/time.h>
#include "drm.h"
-#include "i915_drm.h"
+#include "ioctl_wrappers.h"
#include "drmtest.h"
#define BATCH_SIZE (1024*1024)
@@ -37,7 +37,7 @@
#include <sys/ioctl.h>
#include <sys/time.h>
#include "drm.h"
-#include "i915_drm.h"
+#include "ioctl_wrappers.h"
#include "drmtest.h"
#include "intel_gpu_tools.h"
@@ -32,6 +32,7 @@
#include <fcntl.h>
#include <limits.h>
#include "drmtest.h"
+#include "ioctl_wrappers.h"
#define FD_ARR_SZ 100
@@ -41,7 +41,7 @@
#include <sys/ioctl.h>
#include <pthread.h>
#include "drm.h"
-#include "i915_drm.h"
+#include "ioctl_wrappers.h"
#include "drmtest.h"
#define OBJECT_SIZE (128*1024) /* restricted to 1MiB alignment on i915 fences */
@@ -34,9 +34,10 @@
#include <fcntl.h>
#include <inttypes.h>
#include <drm.h>
-#include <i915_drm.h>
+#include "ioctl_wrappers.h"
#include "drmtest.h"
+#include "intel_chipset.h"
#include "intel_gpu_tools.h"
#define WIDTH 1024
@@ -34,7 +34,7 @@
#include <sys/stat.h>
#include <sys/ioctl.h>
#include "drm.h"
-#include "i915_drm.h"
+#include "ioctl_wrappers.h"
#include "drmtest.h"
static void
@@ -33,7 +33,7 @@
#include <pthread.h>
#include "drmtest.h"
-#include "i915_drm.h"
+#include "ioctl_wrappers.h"
#include "intel_bufmgr.h"
#include "igt_debugfs.h"
@@ -40,7 +40,7 @@
#include <sys/time.h>
#include <sys/ioctl.h>
#include "drm.h"
-#include "i915_drm.h"
+#include "ioctl_wrappers.h"
#include "drmtest.h"
#include "intel_gpu_tools.h"
@@ -39,8 +39,9 @@
#include <sys/wait.h>
#include "drm.h"
-#include "i915_drm.h"
+#include "ioctl_wrappers.h"
#include "drmtest.h"
+#include "intel_chipset.h"
static const uint32_t canary = 0xdeadbeef;
@@ -38,7 +38,7 @@
#include <sys/ioctl.h>
#include <sys/time.h>
#include "drm.h"
-#include "i915_drm.h"
+#include "ioctl_wrappers.h"
#include "drmtest.h"
#define OBJECT_SIZE 16384
@@ -35,9 +35,10 @@
#include <sys/stat.h>
#include <sys/time.h>
#include "drm.h"
-#include "i915_drm.h"
+#include "ioctl_wrappers.h"
#include "drmtest.h"
#include "intel_bufmgr.h"
+#include "intel_chipset.h"
#include "intel_batchbuffer.h"
#include "intel_gpu_tools.h"
@@ -34,11 +34,12 @@
#include <sys/stat.h>
#include <sys/time.h>
#include "drm.h"
-#include "i915_drm.h"
+#include "ioctl_wrappers.h"
#include "drmtest.h"
#include "intel_bufmgr.h"
#include "intel_batchbuffer.h"
#include "intel_gpu_tools.h"
+#include "intel_chipset.h"
/*
* Testcase: Provoke the hangcheck timer on an otherwise idle system
@@ -34,7 +34,7 @@
#include <sys/stat.h>
#include <sys/ioctl.h>
#include "drm.h"
-#include "i915_drm.h"
+#include "ioctl_wrappers.h"
#include "drmtest.h"
/* Should take 64 pages to store the page pointers on 64 bit */
@@ -42,7 +42,8 @@
#include <sys/stat.h>
#include <sys/time.h>
#include "drm.h"
-#include "i915_drm.h"
+#include "ioctl_wrappers.h"
+#include "intel_chipset.h"
#include "drmtest.h"
#include "intel_bufmgr.h"
#include "intel_batchbuffer.h"
@@ -36,7 +36,7 @@
#include <sys/stat.h>
#include <sys/time.h>
#include "drm.h"
-#include "i915_drm.h"
+#include "ioctl_wrappers.h"
#include "drmtest.h"
#define BATCH_SIZE (1024*1024)
@@ -36,7 +36,7 @@
#include <signal.h>
#include "drm.h"
-#include "i915_drm.h"
+#include "ioctl_wrappers.h"
#include "drmtest.h"
#define OBJECT_SIZE (1024*1024)
@@ -43,11 +43,12 @@
#include <sys/time.h>
#include <getopt.h>
#include "drm.h"
-#include "i915_drm.h"
+#include "ioctl_wrappers.h"
#include "drmtest.h"
#include "intel_bufmgr.h"
#include "intel_batchbuffer.h"
#include "intel_gpu_tools.h"
+#include "intel_chipset.h"
#define WIDTH 64
#define STRIDE (WIDTH)
@@ -35,7 +35,7 @@
#include <sys/stat.h>
#include <sys/ioctl.h>
#include "drm.h"
-#include "i915_drm.h"
+#include "ioctl_wrappers.h"
#include "drmtest.h"
#define OBJECT_SIZE 16384
@@ -36,7 +36,7 @@
#include <sys/stat.h>
#include <sys/ioctl.h>
#include "drm.h"
-#include "i915_drm.h"
+#include "ioctl_wrappers.h"
#include "drmtest.h"
#include "igt_debugfs.h"
@@ -35,7 +35,7 @@
#include <sys/stat.h>
#include <sys/ioctl.h>
#include "drm.h"
-#include "i915_drm.h"
+#include "ioctl_wrappers.h"
#include "drmtest.h"
#define OBJECT_SIZE (1024*1024)
@@ -34,10 +34,11 @@
#include <sys/stat.h>
#include <sys/time.h>
#include "drm.h"
-#include "i915_drm.h"
+#include "ioctl_wrappers.h"
#include "drmtest.h"
#include "intel_bufmgr.h"
#include "intel_batchbuffer.h"
+#include "intel_chipset.h"
#include "intel_gpu_tools.h"
#include "i830_reg.h"
@@ -34,8 +34,9 @@
#include <sys/stat.h>
#include <sys/time.h>
#include "drm.h"
-#include "i915_drm.h"
+#include "ioctl_wrappers.h"
#include "drmtest.h"
+#include "intel_chipset.h"
#include "intel_bufmgr.h"
#include "intel_batchbuffer.h"
#include "intel_gpu_tools.h"
@@ -37,9 +37,10 @@
#include <signal.h>
#include <sys/wait.h>
#include "drm.h"
-#include "i915_drm.h"
+#include "ioctl_wrappers.h"
#include "drmtest.h"
#include "intel_bufmgr.h"
+#include "intel_chipset.h"
#include "intel_batchbuffer.h"
#include "intel_gpu_tools.h"
#include "igt_debugfs.h"
@@ -36,7 +36,7 @@
#include <sys/stat.h>
#include <sys/time.h>
#include "drm.h"
-#include "i915_drm.h"
+#include "ioctl_wrappers.h"
#include "drmtest.h"
#include "intel_chipset.h"
#include "intel_gpu_tools.h"
@@ -40,10 +40,11 @@
#include <sys/stat.h>
#include <sys/time.h>
#include "drm.h"
-#include "i915_drm.h"
+#include "ioctl_wrappers.h"
#include "drmtest.h"
#include "intel_bufmgr.h"
#include "intel_batchbuffer.h"
+#include "intel_chipset.h"
#include "intel_gpu_tools.h"
static drm_intel_bufmgr *bufmgr;
@@ -37,7 +37,7 @@
#include <sys/ioctl.h>
#include <sys/time.h>
#include "drm.h"
-#include "i915_drm.h"
+#include "ioctl_wrappers.h"
#include "drmtest.h"
#define OBJECT_SIZE 16384
@@ -43,8 +43,9 @@
#include <sys/stat.h>
#include <sys/time.h>
#include "drm.h"
-#include "i915_drm.h"
+#include "ioctl_wrappers.h"
#include "drmtest.h"
+#include "intel_chipset.h"
#include "intel_bufmgr.h"
#include "intel_batchbuffer.h"
#include "intel_gpu_tools.h"
@@ -37,7 +37,7 @@
#include <sys/ioctl.h>
#include <sys/time.h>
#include "drm.h"
-#include "i915_drm.h"
+#include "ioctl_wrappers.h"
#include "drmtest.h"
#define OBJECT_SIZE 16384
@@ -37,8 +37,9 @@
#include <sys/ioctl.h>
#include <sys/time.h>
#include "drm.h"
-#include "i915_drm.h"
+#include "ioctl_wrappers.h"
#include "drmtest.h"
+#include "intel_chipset.h"
#include "intel_bufmgr.h"
#include "intel_batchbuffer.h"
#include "intel_gpu_tools.h"
@@ -35,7 +35,7 @@
#include <sys/stat.h>
#include <sys/ioctl.h>
#include "drm.h"
-#include "i915_drm.h"
+#include "ioctl_wrappers.h"
#include "drmtest.h"
#define OBJECT_SIZE 16384
@@ -27,7 +27,7 @@
#include <stdio.h>
#include <string.h>
-#include "i915_drm.h"
+#include "ioctl_wrappers.h"
#include "drmtest.h"
struct local_drm_i915_reg_read {
@@ -43,7 +43,8 @@
#include <sys/time.h>
#include <sys/types.h>
#include "drm.h"
-#include "i915_drm.h"
+#include "ioctl_wrappers.h"
+#include "intel_chipset.h"
#include "drmtest.h"
#include "intel_gpu_tools.h"
@@ -37,10 +37,11 @@
#include <signal.h>
#include <sys/wait.h>
#include "drm.h"
-#include "i915_drm.h"
+#include "ioctl_wrappers.h"
#include "drmtest.h"
#include "intel_bufmgr.h"
#include "intel_batchbuffer.h"
+#include "intel_chipset.h"
#include "intel_gpu_tools.h"
#include "igt_debugfs.h"
@@ -43,11 +43,12 @@
#include <sys/time.h>
#include <getopt.h>
#include "drm.h"
-#include "i915_drm.h"
+#include "ioctl_wrappers.h"
#include "drmtest.h"
#include "intel_bufmgr.h"
#include "intel_batchbuffer.h"
#include "intel_gpu_tools.h"
+#include "intel_chipset.h"
#define WIDTH 512
#define STRIDE (WIDTH*4)
@@ -48,11 +48,13 @@
#include <sys/time.h>
#include <getopt.h>
#include "drm.h"
-#include "i915_drm.h"
+#include "ioctl_wrappers.h"
#include "drmtest.h"
#include "intel_bufmgr.h"
#include "intel_batchbuffer.h"
#include "intel_gpu_tools.h"
+#include "intel_chipset.h"
+
#define WIDTH 512
#define STRIDE (WIDTH*4)
#define HEIGHT 512
@@ -44,11 +44,12 @@
#include <sys/time.h>
#include <getopt.h>
#include "drm.h"
-#include "i915_drm.h"
+#include "ioctl_wrappers.h"
#include "drmtest.h"
#include "intel_bufmgr.h"
#include "intel_batchbuffer.h"
#include "intel_gpu_tools.h"
+#include "intel_chipset.h"
#define WIDTH 512
#define STRIDE (WIDTH*4)
@@ -40,10 +40,11 @@
#include <time.h>
#include <signal.h>
-#include "i915_drm.h"
+#include "ioctl_wrappers.h"
#include "drmtest.h"
#include "igt_debugfs.h"
#include "intel_bufmgr.h"
+#include "intel_chipset.h"
#include "intel_batchbuffer.h"
#include "intel_gpu_tools.h"
@@ -50,9 +50,10 @@
#include <stdlib.h>
#include <stdbool.h>
-#include "i915_drm.h"
+#include "ioctl_wrappers.h"
#include "drmtest.h"
#include "intel_batchbuffer.h"
+#include "intel_chipset.h"
#define WIDTH 512
#define HEIGHT 512
@@ -34,12 +34,13 @@
#include <sys/stat.h>
#include <sys/time.h>
#include "drm.h"
-#include "i915_drm.h"
+#include "ioctl_wrappers.h"
#include "drmtest.h"
#include "intel_bufmgr.h"
#include "intel_batchbuffer.h"
#include "intel_gpu_tools.h"
#include "i830_reg.h"
+#include "intel_chipset.h"
static drm_intel_bufmgr *bufmgr;
struct intel_batchbuffer *batch;
@@ -42,9 +42,10 @@
#include <sys/time.h>
#include "drm.h"
-#include "i915_drm.h"
+#include "ioctl_wrappers.h"
#include "drmtest.h"
#include "intel_bufmgr.h"
+#include "intel_chipset.h"
#include "intel_batchbuffer.h"
#include "intel_gpu_tools.h"
@@ -42,12 +42,13 @@
#include <getopt.h>
#include <signal.h>
-#include "i915_drm.h"
+#include "ioctl_wrappers.h"
#include "drmtest.h"
#include "igt_core.h"
#include "intel_bufmgr.h"
#include "intel_batchbuffer.h"
#include "intel_gpu_tools.h"
+#include "intel_chipset.h"
static int devid;
static int card_index = 0;
@@ -54,10 +54,11 @@
#include <sys/time.h>
#include <stdbool.h>
#include "drm.h"
-#include "i915_drm.h"
+#include "ioctl_wrappers.h"
#include "drmtest.h"
#include "intel_bufmgr.h"
#include "intel_batchbuffer.h"
+#include "intel_chipset.h"
#include "intel_gpu_tools.h"
static drm_intel_bufmgr *bufmgr;
@@ -35,9 +35,10 @@
#include <sys/stat.h>
#include <sys/ioctl.h>
#include "drm.h"
-#include "i915_drm.h"
+#include "ioctl_wrappers.h"
#include "drmtest.h"
#include "intel_gpu_tools.h"
+#include "intel_chipset.h"
#define OBJECT_SIZE (1024*1024)
#define TEST_STRIDE (1024*4)
@@ -35,7 +35,7 @@
#include <sys/stat.h>
#include <sys/ioctl.h>
#include "drm.h"
-#include "i915_drm.h"
+#include "ioctl_wrappers.h"
#include "drmtest.h"
#include "intel_gpu_tools.h"
@@ -35,9 +35,10 @@
#include <sys/stat.h>
#include <sys/time.h>
#include "drm.h"
-#include "i915_drm.h"
+#include "ioctl_wrappers.h"
#include "drmtest.h"
#include "intel_bufmgr.h"
+#include "intel_chipset.h"
#include "intel_batchbuffer.h"
#include "intel_gpu_tools.h"
@@ -35,11 +35,12 @@
#include <sys/stat.h>
#include <sys/time.h>
#include "drm.h"
-#include "i915_drm.h"
+#include "ioctl_wrappers.h"
#include "drmtest.h"
#include "intel_bufmgr.h"
#include "intel_batchbuffer.h"
#include "intel_gpu_tools.h"
+#include "intel_chipset.h"
static drm_intel_bufmgr *bufmgr;
struct intel_batchbuffer *batch;
@@ -35,11 +35,12 @@
#include <sys/stat.h>
#include <sys/time.h>
#include "drm.h"
-#include "i915_drm.h"
+#include "ioctl_wrappers.h"
#include "drmtest.h"
#include "intel_bufmgr.h"
#include "intel_batchbuffer.h"
#include "intel_gpu_tools.h"
+#include "intel_chipset.h"
static drm_intel_bufmgr *bufmgr;
struct intel_batchbuffer *batch;
@@ -35,11 +35,12 @@
#include <sys/stat.h>
#include <sys/time.h>
#include "drm.h"
-#include "i915_drm.h"
+#include "ioctl_wrappers.h"
#include "drmtest.h"
#include "intel_bufmgr.h"
#include "intel_batchbuffer.h"
#include "intel_gpu_tools.h"
+#include "intel_chipset.h"
static drm_intel_bufmgr *bufmgr;
struct intel_batchbuffer *batch;
@@ -34,11 +34,12 @@
#include <sys/stat.h>
#include <sys/time.h>
#include "drm.h"
-#include "i915_drm.h"
+#include "ioctl_wrappers.h"
#include "drmtest.h"
#include "intel_bufmgr.h"
#include "intel_batchbuffer.h"
#include "intel_gpu_tools.h"
+#include "intel_chipset.h"
#define LOCAL_I915_EXEC_VEBOX (4<<0)
@@ -60,11 +60,12 @@
#include <sys/time.h>
#include <getopt.h>
#include "drm.h"
-#include "i915_drm.h"
+#include "ioctl_wrappers.h"
#include "drmtest.h"
#include "intel_bufmgr.h"
#include "intel_batchbuffer.h"
#include "intel_gpu_tools.h"
+#include "intel_chipset.h"
#define CMD_POLY_STIPPLE_OFFSET 0x7906
@@ -31,7 +31,7 @@
#include <pthread.h>
#include "drmtest.h"
-#include "i915_drm.h"
+#include "ioctl_wrappers.h"
#include "intel_bufmgr.h"
/* Testcase: check parallel access to tiled memory
@@ -50,10 +50,11 @@
#include <sys/stat.h>
#include <sys/time.h>
#include "drm.h"
-#include "i915_drm.h"
+#include "ioctl_wrappers.h"
#include "drmtest.h"
#include "intel_bufmgr.h"
#include "intel_batchbuffer.h"
+#include "intel_chipset.h"
#include "intel_gpu_tools.h"
static drm_intel_bufmgr *bufmgr;
@@ -50,11 +50,12 @@
#include <sys/stat.h>
#include <sys/time.h>
#include "drm.h"
-#include "i915_drm.h"
+#include "ioctl_wrappers.h"
#include "drmtest.h"
#include "intel_bufmgr.h"
#include "intel_batchbuffer.h"
#include "intel_gpu_tools.h"
+#include "intel_chipset.h"
static drm_intel_bufmgr *bufmgr;
struct intel_batchbuffer *batch;
@@ -34,9 +34,10 @@
#include <sys/stat.h>
#include <sys/time.h>
#include "drm.h"
-#include "i915_drm.h"
+#include "ioctl_wrappers.h"
#include "drmtest.h"
#include "intel_bufmgr.h"
+#include "intel_chipset.h"
#include "intel_batchbuffer.h"
#include "intel_gpu_tools.h"
@@ -45,9 +45,10 @@
#include <sys/time.h>
#include <sys/ioctl.h>
#include "drm.h"
-#include "i915_drm.h"
+#include "ioctl_wrappers.h"
#include "drmtest.h"
#include "intel_gpu_tools.h"
+#include "intel_chipset.h"
#define WIDTH 512
#define HEIGHT 512
@@ -54,7 +54,7 @@
#include <sys/time.h>
#include <sys/ioctl.h>
#include "drm.h"
-#include "i915_drm.h"
+#include "ioctl_wrappers.h"
#include "drmtest.h"
#include "intel_gpu_tools.h"
@@ -54,7 +54,7 @@
#include <sys/time.h>
#include <sys/ioctl.h>
#include "drm.h"
-#include "i915_drm.h"
+#include "ioctl_wrappers.h"
#include "drmtest.h"
#include "intel_gpu_tools.h"
@@ -36,9 +36,10 @@
#include <sys/stat.h>
#include <sys/ioctl.h>
#include "drm.h"
-#include "i915_drm.h"
+#include "ioctl_wrappers.h"
#include "drmtest.h"
#include "intel_gpu_tools.h"
+#include "intel_chipset.h"
static void do_test_invalid_tiling(int fd, uint32_t handle, int tiling, int stride)
{
@@ -48,11 +48,12 @@
#include <sys/time.h>
#include <stdbool.h>
#include "drm.h"
-#include "i915_drm.h"
+#include "ioctl_wrappers.h"
#include "drmtest.h"
#include "intel_bufmgr.h"
#include "intel_batchbuffer.h"
#include "intel_gpu_tools.h"
+#include "intel_chipset.h"
static drm_intel_bufmgr *bufmgr;
struct intel_batchbuffer *batch;
@@ -41,11 +41,12 @@
#include <sys/stat.h>
#include <sys/time.h>
#include "drm.h"
-#include "i915_drm.h"
+#include "ioctl_wrappers.h"
#include "drmtest.h"
#include "intel_bufmgr.h"
#include "intel_batchbuffer.h"
#include "intel_gpu_tools.h"
+#include "intel_chipset.h"
static drm_intel_bufmgr *bufmgr;
struct intel_batchbuffer *batch;
@@ -44,7 +44,7 @@
#include <sys/stat.h>
#include <sys/time.h>
#include "drm.h"
-#include "i915_drm.h"
+#include "ioctl_wrappers.h"
#include "drmtest.h"
#include "intel_bufmgr.h"
#include "intel_batchbuffer.h"
@@ -38,11 +38,12 @@
#include <sys/time.h>
#include <getopt.h>
#include "drm.h"
-#include "i915_drm.h"
+#include "ioctl_wrappers.h"
#include "drmtest.h"
#include "intel_bufmgr.h"
#include "intel_batchbuffer.h"
#include "intel_gpu_tools.h"
+#include "intel_chipset.h"
#define MSEC_PER_SEC 1000L
#define USEC_PER_MSEC 1000L
@@ -34,10 +34,11 @@
#include <sys/stat.h>
#include <sys/time.h>
#include "drm.h"
-#include "i915_drm.h"
+#include "ioctl_wrappers.h"
#include "drmtest.h"
#include "intel_bufmgr.h"
#include "intel_batchbuffer.h"
+#include "intel_chipset.h"
#include "intel_gpu_tools.h"
#include "i830_reg.h"
@@ -43,9 +43,10 @@
#include <sys/time.h>
#include <sys/ioctl.h>
#include "drm.h"
-#include "i915_drm.h"
+#include "ioctl_wrappers.h"
#include "drmtest.h"
#include "intel_gpu_tools.h"
+#include "intel_chipset.h"
#include "i915_reg.h"
#include "i915_3d.h"
@@ -42,9 +42,10 @@
#include <sys/stat.h>
#include <sys/time.h>
#include "drm.h"
-#include "i915_drm.h"
+#include "ioctl_wrappers.h"
#include "drmtest.h"
#include "intel_gpu_tools.h"
+#include "intel_chipset.h"
#include "i915_reg.h"
#include "i915_3d.h"
@@ -43,9 +43,10 @@
#include <sys/time.h>
#include <sys/ioctl.h>
#include "drm.h"
-#include "i915_drm.h"
+#include "ioctl_wrappers.h"
#include "drmtest.h"
#include "intel_gpu_tools.h"
+#include "intel_chipset.h"
#include "i915_reg.h"
#include "i915_3d.h"
@@ -43,9 +43,10 @@
#include <sys/time.h>
#include <sys/ioctl.h>
#include "drm.h"
-#include "i915_drm.h"
+#include "ioctl_wrappers.h"
#include "drmtest.h"
#include "intel_gpu_tools.h"
+#include "intel_chipset.h"
#include "i915_reg.h"
#include "i915_3d.h"
@@ -43,9 +43,10 @@
#include <sys/time.h>
#include <sys/ioctl.h>
#include "drm.h"
-#include "i915_drm.h"
+#include "ioctl_wrappers.h"
#include "drmtest.h"
#include "intel_gpu_tools.h"
+#include "intel_chipset.h"
#include "i915_reg.h"
#include "i915_3d.h"
@@ -35,10 +35,11 @@
#include <string.h>
#include "drm.h"
-#include "i915_drm.h"
+#include "ioctl_wrappers.h"
#include "i915_pciids.h"
#include "drmtest.h"
#include "intel_gpu_tools.h"
+#include "intel_chipset.h"
#define FORCEWAKE_MT 0xa188
@@ -35,7 +35,7 @@
#include <sys/stat.h>
#include <sys/ioctl.h>
#include "drm.h"
-#include "i915_drm.h"
+#include "ioctl_wrappers.h"
#include "drmtest.h"
#include "drm_fourcc.h"
@@ -27,12 +27,14 @@
#include <stdio.h>
#include <string.h>
-#include "drm_fourcc.h"
+#include <drm_fourcc.h>
#include "drmtest.h"
#include "igt_debugfs.h"
#include "igt_kms.h"
+#include "intel_chipset.h"
#include "intel_batchbuffer.h"
+#include "ioctl_wrappers.h"
enum test_mode {
TEST_PAGE_FLIP,
@@ -35,10 +35,12 @@
#include <sys/time.h>
#include <sys/ioctl.h>
#include <linux/kd.h>
+#include <time.h>
+#include <pthread.h>
-#include "i915_drm.h"
+#include "ioctl_wrappers.h"
#include "drmtest.h"
-#include "testdisplay.h"
+#include "intel_chipset.h"
#include "intel_batchbuffer.h"
#include "igt_kms.h"
@@ -30,13 +30,16 @@
#include <unistd.h>
#include <sys/time.h>
-#include "drm_fourcc.h"
+#include <drm_fourcc.h>
+
#include "drmtest.h"
#include "testdisplay.h"
#include "intel_bufmgr.h"
#include "intel_batchbuffer.h"
#include "intel_gpu_tools.h"
+#include "intel_chipset.h"
#include "igt_kms.h"
+#include "ioctl_wrappers.h"
drmModeRes *resources;
int drm_fd;
@@ -31,6 +31,8 @@
#include "drmtest.h"
#include "igt_kms.h"
+#include "intel_gpu_tools.h"
+#include "intel_chipset.h"
/* We know that if we don't enable audio runtime PM, snd_hda_intel will never
* release its power well refcount, and we'll never reach the LPSP sate. OTOH
@@ -44,7 +44,8 @@
#include "drmtest.h"
#include "intel_batchbuffer.h"
#include "intel_gpu_tools.h"
-#include "i915_drm.h"
+#include "intel_chipset.h"
+#include "ioctl_wrappers.h"
#include "igt_kms.h"
#include "igt_debugfs.h"
@@ -34,11 +34,14 @@
#include <getopt.h>
#include <fcntl.h>
#include <signal.h>
+
#include "drmtest.h"
#include "intel_gpu_tools.h"
#include "intel_bufmgr.h"
#include "intel_batchbuffer.h"
+#include "intel_chipset.h"
#include "igt_debugfs.h"
+#include "ioctl_wrappers.h"
static int drm_fd;
@@ -19,6 +19,7 @@
#include "intel_gpu_tools.h"
#include "intel_batchbuffer.h"
#include "drmtest.h"
+#include "intel_chipset.h"
#define BO_SIZE (256*1024)
@@ -23,11 +23,12 @@
#include <sys/ioctl.h>
#include <errno.h>
-#include "i915_drm.h"
+#include "ioctl_wrappers.h"
#include "intel_bufmgr.h"
#include "nouveau.h"
#include "intel_gpu_tools.h"
#include "intel_batchbuffer.h"
+#include "intel_chipset.h"
#include "drmtest.h"
static int intel_fd = -1, nouveau_fd = -1;
@@ -22,11 +22,12 @@
#include <sys/stat.h>
#include <sys/ioctl.h>
-#include "i915_drm.h"
+#include "ioctl_wrappers.h"
#include "intel_bufmgr.h"
#include "nouveau.h"
#include "intel_gpu_tools.h"
#include "intel_batchbuffer.h"
+#include "intel_chipset.h"
#include "drmtest.h"
int intel_fd = -1, nouveau_fd = -1;
@@ -44,7 +44,7 @@
#include <pthread.h>
#include "drm.h"
-#include "i915_drm.h"
+#include "ioctl_wrappers.h"
#include "drmtest.h"
#include "igt_debugfs.h"
@@ -25,11 +25,12 @@
#include "xf86drm.h"
#include "xf86drmMode.h"
-#include "i915_drm.h"
+#include "ioctl_wrappers.h"
#include "intel_bufmgr.h"
#include "intel_gpu_tools.h"
#include "intel_batchbuffer.h"
#include "drmtest.h"
+#include "intel_chipset.h"
int intel_fd = -1, udl_fd = -1;
drm_intel_bufmgr *bufmgr;
@@ -62,7 +62,7 @@
#include <sys/types.h>
#include <sys/stat.h>
-#include "i915_drm.h"
+#include "ioctl_wrappers.h"
#include "drmtest.h"
#include "testdisplay.h"
#include "igt_kms.h"
@@ -48,6 +48,7 @@
#include "intel_gpu_tools.h"
#include "intel_bufmgr.h"
#include "intel_batchbuffer.h"
+#include "intel_chipset.h"
#define GEN5_COUNTER_COUNT 29
Brought a few missing headers to light in ioctl_wrappers.h, too. Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch> --- benchmarks/intel_upload_blit_large.c | 1 + benchmarks/intel_upload_blit_large_gtt.c | 1 + benchmarks/intel_upload_blit_large_map.c | 1 + benchmarks/intel_upload_blit_small.c | 1 + demos/intel_sprite_on.c | 7 +++---- lib/drmtest.c | 1 + lib/drmtest.h | 7 ------- lib/igt_debugfs.c | 1 + lib/igt_kms.c | 1 + lib/ioctl_wrappers.h | 5 +++++ lib/rendercopy_gen7.c | 1 + tests/core_get_client_auth.c | 2 +- tests/drm_vma_limiter.c | 3 ++- tests/drm_vma_limiter_cached.c | 3 ++- tests/drm_vma_limiter_cpu.c | 3 ++- tests/drm_vma_limiter_gtt.c | 3 ++- tests/drv_suspend.c | 2 +- tests/gem_bad_address.c | 3 ++- tests/gem_bad_batch.c | 3 ++- tests/gem_bad_blit.c | 3 ++- tests/gem_bad_length.c | 2 +- tests/gem_basic.c | 2 +- tests/gem_caching.c | 3 ++- tests/gem_close_race.c | 3 ++- tests/gem_concurrent_blit.c | 3 ++- tests/gem_cpu_reloc.c | 3 ++- tests/gem_cs_prefetch.c | 3 ++- tests/gem_cs_tlb.c | 2 +- tests/gem_ctx_bad_destroy.c | 2 +- tests/gem_ctx_bad_exec.c | 2 +- tests/gem_ctx_basic.c | 3 ++- tests/gem_ctx_create.c | 2 +- tests/gem_ctx_exec.c | 2 +- tests/gem_double_irq_loop.c | 3 ++- tests/gem_dummy_reloc_loop.c | 3 ++- tests/gem_evict_alignment.c | 3 ++- tests/gem_evict_everything.c | 3 ++- tests/gem_exec_bad_domains.c | 3 ++- tests/gem_exec_big.c | 2 +- tests/gem_exec_blt.c | 2 +- tests/gem_exec_faulting_reloc.c | 2 +- tests/gem_exec_lut_handle.c | 2 +- tests/gem_exec_nop.c | 2 +- tests/gem_fd_exhaustion.c | 1 + tests/gem_fence_thrash.c | 2 +- tests/gem_fenced_exec_thrash.c | 3 ++- tests/gem_flink.c | 2 +- tests/gem_flink_race.c | 2 +- tests/gem_gtt_cpu_tlb.c | 2 +- tests/gem_gtt_hog.c | 3 ++- tests/gem_gtt_speed.c | 2 +- tests/gem_hang.c | 3 ++- tests/gem_hangcheck_forcewake.c | 3 ++- tests/gem_largeobject.c | 2 +- tests/gem_linear_blits.c | 3 ++- tests/gem_lut_handle.c | 2 +- tests/gem_madvise.c | 2 +- tests/gem_media_fill.c | 3 ++- tests/gem_mmap.c | 2 +- tests/gem_mmap_gtt.c | 2 +- tests/gem_mmap_offset_exhaustion.c | 2 +- tests/gem_non_secure_batch.c | 3 ++- tests/gem_partial_pwrite_pread.c | 3 ++- tests/gem_persistent_relocs.c | 3 ++- tests/gem_pin.c | 2 +- tests/gem_pipe_control_store_loop.c | 3 ++- tests/gem_pread.c | 2 +- tests/gem_pread_after_blit.c | 3 ++- tests/gem_pwrite.c | 2 +- tests/gem_pwrite_pread.c | 3 ++- tests/gem_readwrite.c | 2 +- tests/gem_reg_read.c | 2 +- tests/gem_reloc_overflow.c | 3 ++- tests/gem_reloc_vs_gpu.c | 3 ++- tests/gem_render_copy.c | 3 ++- tests/gem_render_linear_blits.c | 4 +++- tests/gem_render_tiled_blits.c | 3 ++- tests/gem_reset_stats.c | 3 ++- tests/gem_ring_sync_copy.c | 3 ++- tests/gem_ring_sync_loop.c | 3 ++- tests/gem_ringfill.c | 3 ++- tests/gem_seqno_wrap.c | 3 ++- tests/gem_set_tiling_vs_blt.c | 3 ++- tests/gem_set_tiling_vs_gtt.c | 3 ++- tests/gem_set_tiling_vs_pwrite.c | 2 +- tests/gem_storedw_batches_loop.c | 3 ++- tests/gem_storedw_loop_blt.c | 3 ++- tests/gem_storedw_loop_bsd.c | 3 ++- tests/gem_storedw_loop_render.c | 3 ++- tests/gem_storedw_loop_vebox.c | 3 ++- tests/gem_stress.c | 3 ++- tests/gem_threaded_access_tiled.c | 2 +- tests/gem_tiled_blits.c | 3 ++- tests/gem_tiled_fence_blits.c | 3 ++- tests/gem_tiled_partial_pwrite_pread.c | 3 ++- tests/gem_tiled_pread.c | 3 ++- tests/gem_tiled_pread_pwrite.c | 2 +- tests/gem_tiled_swapping.c | 2 +- tests/gem_tiling_max_stride.c | 3 ++- tests/gem_unfence_active_buffers.c | 3 ++- tests/gem_unref_active_buffers.c | 3 ++- tests/gem_vmap_blits.c | 2 +- tests/gem_wait_render_timeout.c | 3 ++- tests/gem_write_read_ring_switch.c | 3 ++- tests/gen3_mixed_blits.c | 3 ++- tests/gen3_render_linear_blits.c | 3 ++- tests/gen3_render_mixed_blits.c | 3 ++- tests/gen3_render_tiledx_blits.c | 3 ++- tests/gen3_render_tiledy_blits.c | 3 ++- tests/gen7_forcewake_mt.c | 3 ++- tests/kms_addfb.c | 2 +- tests/kms_fbc_crc.c | 4 +++- tests/kms_flip.c | 6 ++++-- tests/kms_render.c | 5 ++++- tests/pm_lpsp.c | 2 ++ tests/pm_pc8.c | 3 ++- tests/pm_rps.c | 3 +++ tests/prime_nv_api.c | 1 + tests/prime_nv_pcopy.c | 3 ++- tests/prime_nv_test.c | 3 ++- tests/prime_self_import.c | 2 +- tests/prime_udl.c | 3 ++- tests/testdisplay.c | 2 +- tools/intel_perf_counters.c | 1 + 124 files changed, 208 insertions(+), 120 deletions(-)