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

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

drivers/gpu/drm/i915/gem/i915_gem_context.c

+4 −5
Original line number Diff line number Diff line
@@ -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,

						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 i915_gem_engines *e, *err;

	enum intel_engine_id id;



	e = alloc_engines(I915_NUM_ENGINES);

	e = alloc_engines(max);

	if (!e)

		return ERR_PTR(-ENOMEM);



	for_each_engine(engine, gt, id) {

	for_each_uabi_engine(engine, ctx->i915) {

		struct intel_context *ce;

		struct intel_sseu sseu = {};

		int ret;
@@ -1113,7 +1112,7 @@ static struct i915_gem_engines *default_engines(struct i915_gem_context *ctx, 
		if (engine->legacy_idx == INVALID_ENGINE)

			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]);



		ce = intel_context_create(engine);