diff options
| author | Jason Ekstrand <jason@jlekstrand.net> | 2021-04-19 14:50:28 -0500 |
|---|---|---|
| committer | Jason Ekstrand <jason@jlekstrand.net> | 2021-07-08 12:45:33 -0500 |
| commit | fce12bd22423c44d1ec770cb3831d40b3c8512f4 (patch) | |
| tree | 3a7f183fdd5ce969ff3b6b444b9eeb7c6ea89579 /tests/i915/gem_mmap_gtt.c | |
| parent | ccb30c841fec9308eb5aa79da2481fcf5384f6f5 (diff) | |
tests/i915/gem_mmap_gtt: Convert to intel_ctx_t (v2)
v2 (Ashutosh Dixit):
- Split the i915_query changes into their own patch
Signed-off-by: Jason Ekstrand <jason@jlekstrand.net>
Reviewed-by: Ashutosh Dixit <ashutosh.dixit@intel.com>
Acked-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Diffstat (limited to 'tests/i915/gem_mmap_gtt.c')
| -rw-r--r-- | tests/i915/gem_mmap_gtt.c | 18 |
1 files changed, 14 insertions, 4 deletions
diff --git a/tests/i915/gem_mmap_gtt.c b/tests/i915/gem_mmap_gtt.c index cbfa222a..60282699 100644 --- a/tests/i915/gem_mmap_gtt.c +++ b/tests/i915/gem_mmap_gtt.c @@ -737,14 +737,18 @@ static void test_hang_busy(int i915) { uint32_t *ptr, *tile, *x; + const intel_ctx_t *ctx = intel_ctx_create(i915, NULL); igt_spin_t *spin; igt_hang_t hang; uint32_t handle; - hang = igt_allow_hang(i915, 0, 0); + hang = igt_allow_hang(i915, ctx->id, 0); igt_require(igt_params_set(i915, "reset", "1")); /* global */ - spin = igt_spin_new(i915, .flags = IGT_SPIN_POLL_RUN | IGT_SPIN_FENCE_OUT | IGT_SPIN_NO_PREEMPTION); + spin = igt_spin_new(i915, .ctx = ctx, + .flags = IGT_SPIN_POLL_RUN | + IGT_SPIN_FENCE_OUT | + IGT_SPIN_NO_PREEMPTION); igt_spin_busywait_until_started(spin); igt_assert(spin->execbuf.buffer_count == 2); @@ -785,20 +789,25 @@ test_hang_busy(int i915) igt_spin_free(i915, spin); igt_disallow_hang(i915, hang); + intel_ctx_destroy(i915, ctx); } static void test_hang_user(int i915) { + const intel_ctx_t *ctx = intel_ctx_create(i915, NULL); uint32_t *ptr, *mem, *x; igt_spin_t *spin; igt_hang_t hang; uint32_t handle; - hang = igt_allow_hang(i915, 0, 0); + hang = igt_allow_hang(i915, ctx->id, 0); igt_require(igt_params_set(i915, "reset", "1")); /* global */ - spin = igt_spin_new(i915, .flags = IGT_SPIN_POLL_RUN | IGT_SPIN_FENCE_OUT | IGT_SPIN_NO_PREEMPTION); + spin = igt_spin_new(i915, .ctx = ctx, + .flags = IGT_SPIN_POLL_RUN | + IGT_SPIN_FENCE_OUT | + IGT_SPIN_NO_PREEMPTION); igt_spin_busywait_until_started(spin); igt_assert(spin->execbuf.buffer_count == 2); @@ -835,6 +844,7 @@ test_hang_user(int i915) igt_spin_free(i915, spin); igt_disallow_hang(i915, hang); + intel_ctx_destroy(i915, ctx); } static int min_tile_width(uint32_t devid, int tiling) |