summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJasmine Newsome <jasmine.newsome@intel.com>2022-02-23 16:42:20 -0800
committerAshutosh Dixit <ashutosh.dixit@intel.com>2022-02-24 12:57:19 -0800
commit6546304ecf053b9c5ec278ee3c210d2c6d50a3a6 (patch)
tree3156e8b9abb96cdca574e13fb9b4f3ad65c31cc5
parent4d9396e67930df85aeec626145e02b170f6d3bcd (diff)
tests/i915/gem_spin_batch: Removing context persistence
The spin all test relied on context persistence unecessarily by trying to destroy contexts while keeping spinners active. The current implementation of context persistence in i915 can cause failures with GuC enabled, and persistence is not needed for this test. Moving intel_ctx_destroy after igt_spin_end. Signed-off-by: Jasmine Newsome <jasmine.newsome@intel.com> Reviewed-by: Ashutosh Dixit <ashutosh.dixit@intel.com>
-rw-r--r--tests/i915/gem_spin_batch.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/i915/gem_spin_batch.c b/tests/i915/gem_spin_batch.c
index 653812c7..707d69b6 100644
--- a/tests/i915/gem_spin_batch.c
+++ b/tests/i915/gem_spin_batch.c
@@ -161,8 +161,6 @@ static void spin_all(int i915, const intel_ctx_t *ctx, unsigned int flags)
.engine = e->flags,
.flags = (IGT_SPIN_POLL_RUN |
IGT_SPIN_NO_PREEMPTION));
- if (flags & PARALLEL_SPIN_NEW_CTX)
- intel_ctx_destroy(i915, ctx);
igt_spin_busywait_until_started(spin);
igt_list_move(&spin->link, &list);
@@ -172,6 +170,8 @@ static void spin_all(int i915, const intel_ctx_t *ctx, unsigned int flags)
igt_assert(gem_bo_busy(i915, spin->handle));
ahnd = spin->ahnd;
igt_spin_end(spin);
+ if (flags & PARALLEL_SPIN_NEW_CTX)
+ intel_ctx_destroy(i915, spin->opts.ctx);
gem_sync(i915, spin->handle);
igt_spin_free(i915, spin);
put_ahnd(ahnd);