Verify that the values we store in our nonpriv context image registers
are restored after a switch.
v2: Use explicit ordering to ensure we force the context switch back and
forth in between the register writes and their read.
Signed-off-by: Chris Wilson <chris@xxxxxxxxxxxxxxxxxx>
Cc: Michał Winiarski <michal.winiarski@xxxxxxxxx>
---
tests/i915/gem_ctx_isolation.c | 31 +++++++++++++++++++++++++++++++
1 file changed, 31 insertions(+)
diff --git a/tests/i915/gem_ctx_isolation.c b/tests/i915/gem_ctx_isolation.c
index c4302394e..df1d655ae 100644
--- a/tests/i915/gem_ctx_isolation.c
+++ b/tests/i915/gem_ctx_isolation.c
@@ -579,6 +579,35 @@ static void nonpriv(int fd,
__func__, v, values[v]);
write_regs(fd, ctx, e, flags, values[v]);
+ if (flags & DIRTY2) {
+ uint32_t sw = gem_context_create(fd);
+ igt_spin_t *syncpt, *dirt;
+
+ /* Explicit sync to keep the switch between write/read */
+ syncpt = igt_spin_new(fd,
+ .ctx = ctx,
+ .engine = engine,
+ .flags = IGT_SPIN_FENCE_OUT);
+
+ dirt = igt_spin_new(fd,
+ .ctx = sw,
+ .engine = engine,
+ .fence = syncpt->out_fence,
+ .flags = (IGT_SPIN_FENCE_IN |
+ IGT_SPIN_FENCE_OUT));
+ igt_spin_free(fd, syncpt);
+
+ syncpt = igt_spin_new(fd,
+ .ctx = ctx,
+ .engine = engine,
+ .fence = dirt->out_fence,
+ .flags = IGT_SPIN_FENCE_IN);
+ igt_spin_free(fd, dirt);
+
+ igt_spin_free(fd, syncpt);
+ gem_context_destroy(fd, sw);
+ }
+
regs[1] = read_regs(fd, ctx, e, flags);
/*
@@ -838,6 +867,8 @@ igt_main
igt_subtest_f("%s-nonpriv", e->name)
nonpriv(fd, e, 0);
+ igt_subtest_f("%s-nonpriv-switch", e->name)
+ nonpriv(fd, e, DIRTY2);
igt_subtest_f("%s-clean", e->name)
isolation(fd, e, 0);
--
2.23.0
_______________________________________________
Intel-gfx mailing list
Intel-gfx@xxxxxxxxxxxxxxxxxxxxx
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
