If the context has no engines, it has no engines -- do not override the user's setup.
Signed-off-by: Chris Wilson <[email protected]> --- lib/i915/gem_engine_topology.c | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) diff --git a/lib/i915/gem_engine_topology.c b/lib/i915/gem_engine_topology.c index 9daa03df4..ca1c1fdb9 100644 --- a/lib/i915/gem_engine_topology.c +++ b/lib/i915/gem_engine_topology.c @@ -195,17 +195,6 @@ static int gem_topology_get_param(int fd, if (__gem_context_get_param(fd, p)) return -1; /* using default engine map */ - if (!p->size) - return 0; - - /* size will store the engine count */ - p->size = (p->size - sizeof(struct i915_context_param_engines)) / - (offsetof(struct i915_context_param_engines, - engines[1]) - - sizeof(struct i915_context_param_engines)); - - igt_assert_f(p->size <= GEM_MAX_ENGINES, "unsupported engine count\n"); - return 0; } @@ -242,7 +231,13 @@ struct intel_engine_data intel_init_engine_list(int fd, uint32_t ctx_id) query_engine_list(fd, &engine_data); ctx_map_engines(fd, &engine_data, ¶m); } else { - /* param.size contains the engine count */ + /* engine count can be inferred from size */ + param.size -= sizeof(struct i915_context_param_engines); + param.size /= sizeof(struct i915_engine_class_instance); + + igt_assert_f(param.size <= GEM_MAX_ENGINES, + "unsupported engine count\n"); + for (i = 0; i < param.size; i++) init_engine(&engine_data.engines[i], engines.engines[i].engine_class, -- 2.25.0 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
