From 6796a604bab6df9c84af149e799902360afdd157 Mon Sep 17 00:00:00 2001 From: Chris Wilson Date: Fri, 25 May 2018 16:10:51 +0100 Subject: igt/perf_pmu: Flush to idle after hang We may not idle immediately after a hang, and indeed may send a pulse down the pipeline periodically to become idle. Rather than make a flimsy assumption about how long we need to sleep before the system idles, wait for the system to declare itself idle; flushing it to idle in the process! Signed-off-by: Chris Wilson Cc: Tvrtko Ursulin Reviewed-by: Antonio Argenziano --- tests/perf_pmu.c | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) (limited to 'tests/perf_pmu.c') diff --git a/tests/perf_pmu.c b/tests/perf_pmu.c index 590e6526..9af192dd 100644 --- a/tests/perf_pmu.c +++ b/tests/perf_pmu.c @@ -281,16 +281,9 @@ single(int gem_fd, const struct intel_execution_engine2 *e, unsigned int flags) /* Check for idle after hang. */ if (flags & FLAG_HANG) { - /* Sleep for a bit for reset unwind to settle. */ - usleep(500e3); - /* - * Ensure batch was executing before reset, meaning it must be - * idle by now. Unless it did not even manage to start before we - * triggered the reset, in which case the idleness check below - * might fail. The latter is very unlikely since there are two - * sleeps during which it had an opportunity to start. - */ + gem_quiescent_gpu(gem_fd); igt_assert(!gem_bo_busy(gem_fd, spin->handle)); + val = pmu_read_single(fd); slept = measured_usleep(batch_duration_ns / 1000); val = pmu_read_single(fd) - val; -- cgit v1.2.3