summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Vetter <daniel.vetter@ffwll.ch>2012-01-18 01:03:20 +0100
committerDaniel Vetter <daniel.vetter@ffwll.ch>2012-01-18 01:12:52 +0100
commit699d30950f1d91cd017364765c14fdc4cb63cd14 (patch)
tree3ae8621e3df4690fb6e583015cba812ee7b85003
parentf1de285e7e5e1825f09510b2e6264139ea92f921 (diff)
gem_stress: move a few things out of gem_stress.h
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
-rw-r--r--tests/gem_stress.c5
-rw-r--r--tests/gem_stress.h10
2 files changed, 5 insertions, 10 deletions
diff --git a/tests/gem_stress.c b/tests/gem_stress.c
index 4b61e786..ec669760 100644
--- a/tests/gem_stress.c
+++ b/tests/gem_stress.c
@@ -75,6 +75,11 @@ drm_intel_bo *busy_bo;
struct option_struct options;
+#define MAX_BUFS 4096
+#define SCRATCH_BUF_SIZE 1024*1024
+#define BUSY_BUF_SIZE (256*4096)
+#define TILE_BYTES(size) ((size)*(size)*sizeof(uint32_t))
+
static struct scratch_buf buffers[2][MAX_BUFS];
/* tile i is at logical position tile_permutation[i] */
static unsigned *tile_permutation;
diff --git a/tests/gem_stress.h b/tests/gem_stress.h
index 5c75956d..057ae29b 100644
--- a/tests/gem_stress.h
+++ b/tests/gem_stress.h
@@ -47,16 +47,6 @@ struct option_struct {
};
extern struct option_struct options;
-extern drm_intel_bufmgr *bufmgr;
-extern int drm_fd;
-extern int devid;
-
-extern int fence_storm;
-
-#define MAX_BUFS 4096
-#define SCRATCH_BUF_SIZE 1024*1024
-#define BUSY_BUF_SIZE (256*4096)
-#define TILE_BYTES(size) ((size)*(size)*sizeof(uint32_t))
void keep_gpu_busy(void);