summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorChris Wilson <chris@chris-wilson.co.uk>2016-03-14 14:31:36 +0000
committerChris Wilson <chris@chris-wilson.co.uk>2016-03-14 14:33:36 +0000
commit772393e806791c9af1c050262c92300c9565e823 (patch)
tree11edde7e718fd86169cb8f5a2548aab35d3c56dd /tests
parent2fdf5ac917aad95e9e4ca251b0c35cfa005c2b69 (diff)
igt/gem_exec_nop: Decrease BAT timing
For basic, since CI doesn't hit the same hard lockup on Braswell that is possible without hpet, stop running for so long! Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Diffstat (limited to 'tests')
-rw-r--r--tests/gem_exec_nop.c11
1 files changed, 7 insertions, 4 deletions
diff --git a/tests/gem_exec_nop.c b/tests/gem_exec_nop.c
index c82895bd..c7bb3269 100644
--- a/tests/gem_exec_nop.c
+++ b/tests/gem_exec_nop.c
@@ -104,7 +104,7 @@ static bool ignore_engine(int fd, unsigned engine)
return false;
}
-static void all(int fd, uint32_t handle)
+static void all(int fd, uint32_t handle, int timeout)
{
struct drm_i915_gem_execbuffer2 execbuf;
struct drm_i915_gem_exec_object2 obj;
@@ -144,7 +144,7 @@ static void all(int fd, uint32_t handle)
}
count += nengine * 1024;
clock_gettime(CLOCK_MONOTONIC, &now);
- } while (elapsed(&start, &now) < 150.); /* Hang detection ~120s */
+ } while (elapsed(&start, &now) < timeout); /* Hang detection ~120s */
gem_sync(fd, handle);
clock_gettime(CLOCK_MONOTONIC, &now);
@@ -166,12 +166,15 @@ igt_main
gem_write(device, handle, 0, &bbe, sizeof(bbe));
}
+ igt_subtest("basic")
+ all(device, handle, 10);
+
for (e = intel_execution_engines; e->name; e++)
igt_subtest_f("%s", e->name)
single(device, handle, e->exec_id | e->flags, e->name);
- igt_subtest("basic")
- all(device, handle);
+ igt_subtest("all")
+ all(device, handle, 150);
igt_fixture {
gem_close(device, handle);