Commit e49ceb86 authored by Daniel Vetter's avatar Daniel Vetter

lib: unnecessary header removal for drmtest.h, part 1

Brought a few missing headers to light in ioctl_wrappers.h, too.
Signed-off-by: Daniel Vetter's avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent 924115bf
......@@ -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"