Commit a50134b1 authored by Tvrtko Ursulin's avatar Tvrtko Ursulin Committed by Chris Wilson
Browse files

drm/i915: Make for_each_engine_masked work on intel_gt 



Medium term goal is to eliminate the i915->engine[] array and to get there
we have recently introduced equivalent array in intel_gt. Now we need to
migrate the code further towards this state.

This next step is to eliminate usage of i915->engines[] from the
for_each_engine_masked iterator.

For this to work we also need to use engine->id as index when populating
the gt->engine[] array and adjust the default engine set indexing to use
engine->legacy_idx instead of assuming gt->engines[] indexing.

v2:
  * Populate gt->engine[] earlier.
  * Check that we don't duplicate engine->legacy_idx

v3:
  * Work around the initialization order issue between default_engines()
    and intel_engines_driver_register() which sets engine->legacy_idx for
    now. It will be fixed properly later.

v4:
  * Merge with forgotten v2.5.

Signed-off-by: default avatarTvrtko Ursulin <tvrtko.ursulin@intel.com>
Cc: Chris Wilson <chris@chris-wilson.co.uk>
Reviewed-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Link: https://patchwork.freedesktop.org/patch/msgid/20191017161852.8836-1-tvrtko.ursulin@linux.intel.com
parent 1dfffa00

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

+10 −3
Original line number Diff line number Diff line
@@ -203,15 +203,22 @@ static struct i915_gem_engines *default_engines(struct i915_gem_context *ctx) 
	for_each_engine(engine, gt, id) {

		struct intel_context *ce;



		if (engine->legacy_idx == INVALID_ENGINE)

			continue;



		GEM_BUG_ON(engine->legacy_idx >= I915_NUM_ENGINES);

		GEM_BUG_ON(e->engines[engine->legacy_idx]);



		ce = intel_context_create(ctx, engine);

		if (IS_ERR(ce)) {

			__free_engines(e, id);

			__free_engines(e, e->num_engines + 1);

			return ERR_CAST(ce);

		}



		e->engines[id] = ce;

		e->num_engines = id + 1;

		e->engines[engine->legacy_idx] = ce;

		e->num_engines = max(e->num_engines, engine->legacy_idx);

	}

	e->num_engines++;



	return e;

}

drivers/gpu/drm/i915/gt/intel_engine_cs.c

+5 −0
Original line number Diff line number Diff line
@@ -277,6 +277,9 @@ static int intel_engine_setup(struct intel_gt *gt, enum intel_engine_id id) 
	BUILD_BUG_ON(MAX_ENGINE_CLASS >= BIT(GEN11_ENGINE_CLASS_WIDTH));

	BUILD_BUG_ON(MAX_ENGINE_INSTANCE >= BIT(GEN11_ENGINE_INSTANCE_WIDTH));



	if (GEM_DEBUG_WARN_ON(id >= ARRAY_SIZE(gt->engine)))

		return -EINVAL;



	if (GEM_DEBUG_WARN_ON(info->class > MAX_ENGINE_CLASS))

		return -EINVAL;
@@ -293,6 +296,7 @@ static int intel_engine_setup(struct intel_gt *gt, enum intel_engine_id id) 
	BUILD_BUG_ON(BITS_PER_TYPE(engine->mask) < I915_NUM_ENGINES);



	engine->id = id;

	engine->legacy_idx = INVALID_ENGINE;

	engine->mask = BIT(id);

	engine->i915 = gt->i915;

	engine->gt = gt;
@@ -328,6 +332,7 @@ static int intel_engine_setup(struct intel_gt *gt, enum intel_engine_id id) 
	intel_engine_sanitize_mmio(engine);



	gt->engine_class[info->class][info->instance] = engine;

	gt->engine[id] = engine;



	intel_engine_add_user(engine);

	gt->i915->engine[id] = engine;

drivers/gpu/drm/i915/gt/intel_engine_types.h

+1 −0
Original line number Diff line number Diff line
@@ -148,6 +148,7 @@ enum intel_engine_id { 
	VECS1,

#define _VECS(n) (VECS0 + (n))

	I915_NUM_ENGINES

#define INVALID_ENGINE ((enum intel_engine_id)-1)

};



struct st_preempt_hang {

drivers/gpu/drm/i915/gt/intel_engine_user.c

+5 −13
Original line number Diff line number Diff line
@@ -160,10 +160,10 @@ static int legacy_ring_idx(const struct legacy_ring *ring) 
	};



	if (GEM_DEBUG_WARN_ON(ring->class >= ARRAY_SIZE(map)))

		return -1;

		return INVALID_ENGINE;



	if (GEM_DEBUG_WARN_ON(ring->instance >= map[ring->class].max))

		return -1;

		return INVALID_ENGINE;



	return map[ring->class].base + ring->instance;

}
@@ -171,23 +171,15 @@ static int legacy_ring_idx(const struct legacy_ring *ring) 
static void add_legacy_ring(struct legacy_ring *ring,

			    struct intel_engine_cs *engine)

{

	int idx;



	if (engine->gt != ring->gt || engine->class != ring->class) {

		ring->gt = engine->gt;

		ring->class = engine->class;

		ring->instance = 0;

	}



	idx = legacy_ring_idx(ring);

	if (unlikely(idx == -1))

		return;



	GEM_BUG_ON(idx >= ARRAY_SIZE(ring->gt->engine));

	ring->gt->engine[idx] = engine;

	engine->legacy_idx = legacy_ring_idx(ring);

	if (engine->legacy_idx != INVALID_ENGINE)

		ring->instance++;



	engine->legacy_idx = idx;

}



void intel_engines_driver_register(struct drm_i915_private *i915)

drivers/gpu/drm/i915/gt/intel_gt.c

+1 −1
Original line number Diff line number Diff line
@@ -186,7 +186,7 @@ intel_gt_clear_error_registers(struct intel_gt *gt, 
		struct intel_engine_cs *engine;

		enum intel_engine_id id;



		for_each_engine_masked(engine, i915, engine_mask, id)

		for_each_engine_masked(engine, gt, engine_mask, id)

			gen8_clear_engine_error_register(engine);

	}

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE