Commit 1ec23ed7 authored by Tvrtko Ursulin's avatar Tvrtko Ursulin

drm/i915: Use uabi engines for the default engine map

Default engine map is exactly about uabi engines so no excuse not to use
the appropriate iterator to populate it.
Signed-off-by: default avatarTvrtko Ursulin <tvrtko.ursulin@intel.com>
Signed-off-by: default avatarJonathan Cavitt <jonathan.cavitt@intel.com>
Reviewed-by: default avatarJonathan Cavitt <jonathan.cavitt@intel.com>
[tursulin: Fixed up r-b tag spelling.]
Link: https://patchwork.freedesktop.org/patch/msgid/20230123185629.1593320-1-jonathan.cavitt@intel.com
parent 41badc01
...@@ -1096,16 +1096,15 @@ static struct i915_gem_engines *alloc_engines(unsigned int count) ...@@ -1096,16 +1096,15 @@ static struct i915_gem_engines *alloc_engines(unsigned int count)
static struct i915_gem_engines *default_engines(struct i915_gem_context *ctx, static struct i915_gem_engines *default_engines(struct i915_gem_context *ctx,
struct intel_sseu rcs_sseu) struct intel_sseu rcs_sseu)
{ {
const struct intel_gt *gt = to_gt(ctx->i915); const unsigned int max = I915_NUM_ENGINES;
struct intel_engine_cs *engine; struct intel_engine_cs *engine;
struct i915_gem_engines *e, *err; struct i915_gem_engines *e, *err;
enum intel_engine_id id;
e = alloc_engines(I915_NUM_ENGINES); e = alloc_engines(max);
if (!e) if (!e)
return ERR_PTR(-ENOMEM); return ERR_PTR(-ENOMEM);
for_each_engine(engine, gt, id) { for_each_uabi_engine(engine, ctx->i915) {
struct intel_context *ce; struct intel_context *ce;
struct intel_sseu sseu = {}; struct intel_sseu sseu = {};
int ret; int ret;
...@@ -1113,7 +1112,7 @@ static struct i915_gem_engines *default_engines(struct i915_gem_context *ctx, ...@@ -1113,7 +1112,7 @@ static struct i915_gem_engines *default_engines(struct i915_gem_context *ctx,
if (engine->legacy_idx == INVALID_ENGINE) if (engine->legacy_idx == INVALID_ENGINE)
continue; continue;
GEM_BUG_ON(engine->legacy_idx >= I915_NUM_ENGINES); GEM_BUG_ON(engine->legacy_idx >= max);
GEM_BUG_ON(e->engines[engine->legacy_idx]); GEM_BUG_ON(e->engines[engine->legacy_idx]);
ce = intel_context_create(engine); ce = intel_context_create(engine);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment