igt/gem_ringfill: Allow listing subtests in gem_ringfill

Moved gem_quiescent_gpu() call to the run path.

Signed-off-by: Gabriel Feceoru <gabriel.feceoru@intel.com>
Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
This commit is contained in:
Gabriel Feceoru 2016-01-26 19:40:58 +02:00 committed by Maarten Lankhorst
parent 336235c0a8
commit 711398e82a

View File

@ -99,6 +99,8 @@ static void run_test(int fd, unsigned ring, unsigned flags)
igt_skip_on_f(gen == 6 && (ring & ~(3<<13)) == I915_EXEC_BSD, igt_skip_on_f(gen == 6 && (ring & ~(3<<13)) == I915_EXEC_BSD,
"MI_STORE_DATA broken on gen6 bsd\n"); "MI_STORE_DATA broken on gen6 bsd\n");
gem_quiescent_gpu(fd);
memset(&execbuf, 0, sizeof(execbuf)); memset(&execbuf, 0, sizeof(execbuf));
execbuf.buffers_ptr = (uintptr_t)obj; execbuf.buffers_ptr = (uintptr_t)obj;
execbuf.buffer_count = 2; execbuf.buffer_count = 2;
@ -228,7 +230,6 @@ igt_main
for (mode = modes; mode->prefix; mode++) { for (mode = modes; mode->prefix; mode++) {
for (ring = rings; ring->name; ring++) { for (ring = rings; ring->name; ring++) {
gem_quiescent_gpu(fd);
igt_subtest_f("%s%s%s", igt_subtest_f("%s%s%s",
ring->flags || mode->flags ? "" : mode->prefix, ring->flags || mode->flags ? "" : mode->prefix,
ring->name, ring->name,