diff options
| author | Jason Ekstrand <jason@jlekstrand.net> | 2021-03-26 21:03:53 -0500 |
|---|---|---|
| committer | Jason Ekstrand <jason@jlekstrand.net> | 2021-07-08 12:45:33 -0500 |
| commit | 57f8048e3b68fcaa62f9067476c07b4c059d48e5 (patch) | |
| tree | 3f8df569efc6ab370c53e1e4f7adf5f39a885fa7 | |
| parent | e5ee35d641e057661055e701060bb389d84ba0e2 (diff) | |
tests/amdgpu/amd_prime: Convert to intel_ctx_t
Written totally blind but I'm pretty sure it's right.
Signed-off-by: Jason Ekstrand <jason@jlekstrand.net>
Reviewed-by: Zbigniew Kempczyński <zbigniew.kempczynski@intel.com>
Acked-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
| -rw-r--r-- | tests/amdgpu/amd_prime.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/tests/amdgpu/amd_prime.c b/tests/amdgpu/amd_prime.c index 3e5cc1a7..248fbc35 100644 --- a/tests/amdgpu/amd_prime.c +++ b/tests/amdgpu/amd_prime.c @@ -173,6 +173,7 @@ static void unplug(struct cork *c) static void i915_to_amd(int i915, int amd, amdgpu_device_handle device) { const uint32_t bbe = MI_BATCH_BUFFER_END; + intel_ctx_cfg_t cfg; struct drm_i915_gem_exec_object2 obj[2]; struct drm_i915_gem_execbuffer2 execbuf; const struct intel_execution_engine2 *e; @@ -181,8 +182,10 @@ static void i915_to_amd(int i915, int amd, amdgpu_device_handle device) unsigned long count; struct cork c; + cfg = intel_ctx_cfg_all_physical(i915); + nengine = 0; - __for_each_physical_engine(i915, e) + for_each_ctx_cfg_engine(i915, &cfg, e) engines[nengine++] = e->flags; igt_require(nengine); @@ -199,14 +202,15 @@ static void i915_to_amd(int i915, int amd, amdgpu_device_handle device) count = 0; igt_until_timeout(5) { - execbuf.rsvd1 = gem_context_clone_with_engines(i915, 0); + const intel_ctx_t *ctx = intel_ctx_create(i915, &cfg); + execbuf.rsvd1 = ctx->id; for (unsigned n = 0; n < nengine; n++) { execbuf.flags = engines[n]; gem_execbuf(i915, &execbuf); } - gem_context_destroy(i915, execbuf.rsvd1); + intel_ctx_destroy(i915, ctx); count++; if (!gem_uses_full_ppgtt(i915)) |