diff options
| author | Matthew Brost <matthew.brost@intel.com> | 2020-08-25 12:39:04 -0700 |
|---|---|---|
| committer | Chris Wilson <chris@chris-wilson.co.uk> | 2020-12-22 10:29:13 +0000 |
| commit | 2100c6efd2de767a876977ae1a8a6366e4beb643 (patch) | |
| tree | c0aa1a146b39e37c955f6b623b0402e3dcd152b7 /tests/i915/gem_ctx_persistence.c | |
| parent | 625d7971428dd8f01f7ef779e9f2999eff08ba7f (diff) | |
i915/gem_ctx_persistence: Reset timeout in hostile / hang on each engine
The timeout for a context to be killed / banned with GuC submission is a
bit noisier than with execlist submission so reset the timeout to the
default value on each engine in the hostile / hang sections rather than
using the timeout from the previous engine.
Signed-off-by: Matthew Brost <matthew.brost@intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Diffstat (limited to 'tests/i915/gem_ctx_persistence.c')
| -rw-r--r-- | tests/i915/gem_ctx_persistence.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/i915/gem_ctx_persistence.c b/tests/i915/gem_ctx_persistence.c index b0fdf458..f65a8a7a 100644 --- a/tests/i915/gem_ctx_persistence.c +++ b/tests/i915/gem_ctx_persistence.c @@ -356,7 +356,6 @@ static void test_nonpersistent_hang(int i915, unsigned int engine) static void test_nohangcheck_hostile(int i915) { - int64_t timeout = reset_timeout_ms * NSEC_PER_MSEC; int dir; cleanup(i915); @@ -372,6 +371,7 @@ static void test_nohangcheck_hostile(int i915) igt_require(__enable_hangcheck(dir, false)); for_each_physical_engine(e, i915) { + int64_t timeout = reset_timeout_ms * NSEC_PER_MSEC; uint32_t ctx = gem_context_create(i915); igt_spin_t *spin; @@ -391,7 +391,6 @@ static void test_nohangcheck_hostile(int i915) static void test_nohangcheck_hang(int i915) { - int64_t timeout = reset_timeout_ms * NSEC_PER_MSEC; int dir; cleanup(i915); @@ -409,6 +408,7 @@ static void test_nohangcheck_hang(int i915) igt_require(__enable_hangcheck(dir, false)); for_each_physical_engine(e, i915) { + int64_t timeout = reset_timeout_ms * NSEC_PER_MSEC; uint32_t ctx = gem_context_create(i915); igt_spin_t *spin; |