diff options
| author | Chris Wilson <chris@chris-wilson.co.uk> | 2018-05-11 18:58:59 +0100 |
|---|---|---|
| committer | Chris Wilson <chris@chris-wilson.co.uk> | 2018-05-14 16:10:47 +0100 |
| commit | 89ae332745e31a075747a63ac5acc5baccf75769 (patch) | |
| tree | 97d1b958831ec9d959dd1cf76c3da7106c109254 /tests | |
| parent | 74bfbcf3bc5736f39926acdd3ff03c026e3673ec (diff) | |
tests/gem_eio: Only wait-for-idle inside trigger_reset()
trigger_reset() imposes a tight time constraint (2s) so that we verify
that the reset itself completes quickly. In the middle of this check, we
call gem_quiescent_gpu() which may invoke an rcu_barrier() or two to
clear out the freed memory (DROP_FREED). Those barriers may have
unbounded latency pushing beyond the 2s timeout, so restrict the
operation to only wait-for-idle (DROP_ACTIVE).
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=105957
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Reviewed-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/gem_eio.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/tests/gem_eio.c b/tests/gem_eio.c index 4720b47b..e1aff639 100644 --- a/tests/gem_eio.c +++ b/tests/gem_eio.c @@ -74,8 +74,7 @@ static void trigger_reset(int fd) /* And just check the gpu is indeed running again */ igt_debug("Checking that the GPU recovered\n"); gem_test_engine(fd, ALL_ENGINES); - - gem_quiescent_gpu(fd); + igt_drop_caches_set(fd, DROP_ACTIVE); /* We expect forced reset and health check to be quick. */ igt_assert(igt_seconds_elapsed(&ts) < 2); |