tests: add big batchbuffer test

... and use it in the hangman to stress the error_state capture a bit more.

Uncovered a bug in the obj->pages ->obj->sg_list rework.

4 files changed, 110 insertions, 1 deletions

diff --git a/tests/.gitignore b/tests/.gitignore
index cb8fbb25..d4ca1524 100644
--- a/tests/.gitignore
+++ b/tests/.gitignore
@@ -22,6 +22,7 @@ gem_double_irq_loop
 gem_dummy_reloc_loop
 gem_exec_bad_domains
 gem_exec_blt
+gem_exec_big
 gem_exec_faulting_reloc
 gem_exec_nop
 gem_fenced_exec_thrash
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 5fe5343d..6e6bd7e1 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -21,6 +21,7 @@ TESTS_progs = \
 	gem_cs_tlb \
 	gem_gtt_concurrent_blit \
 	gem_exec_nop \
+	gem_exec_big \
 	gem_exec_blt \
 	gem_exec_bad_domains \
 	gem_exec_faulting_reloc \
diff --git a/tests/ZZ_hangman b/tests/ZZ_hangman
index b8f4a682..cf719722 100755
--- a/tests/ZZ_hangman
+++ b/tests/ZZ_hangman
@@ -27,7 +27,7 @@ fi
 echo 0xf > i915_ring_stop
 echo "rings stopped"
 
-(cd $oldpath; $SOURCE_DIR/gem_exec_nop) > /dev/null
+(cd $oldpath; $SOURCE_DIR/gem_exec_big) > /dev/null
 
 if cat i915_error_state | grep -v "no error state collected" > /dev/null ; then
 	echo "gpu hang correctly dectected"
diff --git a/tests/gem_exec_big.c b/tests/gem_exec_big.c
new file mode 100644
index 00000000..33a26ad0
--- /dev/null
+++ b/tests/gem_exec_big.c
@@ -0,0 +1,107 @@
+/*
+ * Copyright © 2011,2012 Intel Corporation
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+ * IN THE SOFTWARE.
+ *
+ * Authors:
+ *    Chris Wilson <chris@chris-wilson.co.uk>
+ *    Daniel Vetter <daniel.vetter@ffwll.ch>
+ *
+ */
+
+/*
+ * Testcase: run a nop batch which is really big
+ *
+ * Mostly useful to stress-test the error-capture code
+ */
+
+#include <unistd.h>
+#include <stdlib.h>
+#include <stdint.h>
+#include <stdio.h>
+#include <string.h>
+#include <assert.h>
+#include <fcntl.h>
+#include <inttypes.h>
+#include <errno.h>
+#include <sys/stat.h>
+#include <sys/ioctl.h>
+#include <sys/mman.h>
+#include <sys/time.h>
+#include "drm.h"
+#include "i915_drm.h"
+#include "drmtest.h"
+
+#define MI_BATCH_BUFFER_END	(0xA<<23)
+
+static int exec(int fd, uint32_t handle)
+{
+	struct drm_i915_gem_execbuffer2 execbuf;
+	struct drm_i915_gem_exec_object2 gem_exec[1];
+	int ret = 0;
+
+	gem_exec[0].handle = handle;
+	gem_exec[0].relocation_count = 0;
+	gem_exec[0].relocs_ptr = 0;
+	gem_exec[0].alignment = 0;
+	gem_exec[0].offset = 0;
+	gem_exec[0].flags = 0;
+	gem_exec[0].rsvd1 = 0;
+	gem_exec[0].rsvd2 = 0;
+
+	execbuf.buffers_ptr = (uintptr_t)gem_exec;
+	execbuf.buffer_count = 1;
+	execbuf.batch_start_offset = 0;
+	execbuf.batch_len = 8;
+	execbuf.cliprects_ptr = 0;
+	execbuf.num_cliprects = 0;
+	execbuf.DR1 = 0;
+	execbuf.DR4 = 0;
+	execbuf.flags = 0;
+	i915_execbuffer2_set_context_id(execbuf, 0);
+	execbuf.rsvd2 = 0;
+
+	ret = drmIoctl(fd,
+		       DRM_IOCTL_I915_GEM_EXECBUFFER2,
+		       &execbuf);
+	gem_sync(fd, handle);
+
+	return ret;
+}
+
+int main(int argc, char **argv)
+{
+	uint32_t batch[2] = {MI_BATCH_BUFFER_END};
+	uint32_t handle;
+	int fd;
+
+	fd = drm_open_any();
+
+	handle = gem_create(fd, 1024*1024);
+	gem_write(fd, handle, 0, batch, sizeof(batch));
+
+	if (exec(fd, handle))
+		exit(1);
+	gem_close(fd, handle);
+
+	close(fd);
+
+	return 0;
+}