diff options
| author | Chris Wilson <chris@chris-wilson.co.uk> | 2019-05-23 09:05:30 +0100 |
|---|---|---|
| committer | Chris Wilson <chris@chris-wilson.co.uk> | 2019-05-23 12:23:12 +0100 |
| commit | 34a2d27d5b681e6f75d8aa76f75c20e56c287671 (patch) | |
| tree | e1d6afe06ea1cf9adbe6f292376808c7ffdea93b /lib/i915/gem_engine_topology.c | |
| parent | ed4a5515109ee83556f505a9519e33acd9518279 (diff) | |
i915: Improve static engine map for legacy
We need to keep igt working on linus and dif, or Joonas gets very upset.
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Cc: Andi Shyti <andi.shyti@intel.com>
Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Reviewed-by: Andi Shyti <andi.shyti@intel.com>
Reviewed-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Diffstat (limited to 'lib/i915/gem_engine_topology.c')
| -rw-r--r-- | lib/i915/gem_engine_topology.c | 15 |
1 files changed, 4 insertions, 11 deletions
diff --git a/lib/i915/gem_engine_topology.c b/lib/i915/gem_engine_topology.c index d0c8bd5a..fdd1b951 100644 --- a/lib/i915/gem_engine_topology.c +++ b/lib/i915/gem_engine_topology.c @@ -223,22 +223,15 @@ struct intel_engine_data intel_init_engine_list(int fd, uint32_t ctx_id) struct intel_execution_engine2 *__e2 = &engine_data.engines[engine_data.nengines]; - if (!igt_only_list_subtests()) { - __e2->flags = gem_class_instance_to_eb_flags(fd, - e2->class, e2->instance); - - if (!gem_has_ring(fd, __e2->flags)) - continue; - } else { - __e2->flags = -1; /* 0xfff... */ - } - __e2->name = e2->name; __e2->instance = e2->instance; __e2->class = e2->class; + __e2->flags = e2->flags; __e2->is_virtual = false; - engine_data.nengines++; + if (igt_only_list_subtests() || + gem_has_ring(fd, e2->flags)) + engine_data.nengines++; } return engine_data; } |