Commit 7d70a123 authored by Chris Wilson's avatar Chris Wilson
Browse files

drm/i915/gt: Merge engine init/setup loops 



Now that we don't need to create GEM contexts in the middle of engine
construction, we can pull the engine init/setup loops together.

Signed-off-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Cc: Andi Shyti <andi.shyti@intel.com>
Reviewed-by: default avatarAndi Shyti <andi.shyti@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20191222144046.1674865-2-chris@chris-wilson.co.uk
parent cfe6b30f

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

+0 −2
Original line number Diff line number Diff line
@@ -184,7 +184,6 @@ void intel_engine_stop(struct intel_engine_cs *engine); 
void intel_engine_cleanup(struct intel_engine_cs *engine);



int intel_engines_init_mmio(struct intel_gt *gt);

int intel_engines_setup(struct intel_gt *gt);

int intel_engines_init(struct intel_gt *gt);



void intel_engines_release(struct intel_gt *gt);
@@ -194,7 +193,6 @@ int intel_engine_init_common(struct intel_engine_cs *engine); 
void intel_engine_cleanup_common(struct intel_engine_cs *engine);



int intel_ring_submission_setup(struct intel_engine_cs *engine);

int intel_ring_submission_init(struct intel_engine_cs *engine);



int intel_engine_stop_cs(struct intel_engine_cs *engine);

void intel_engine_cancel_stop_cs(struct intel_engine_cs *engine);

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

+33 −75
Original line number Diff line number Diff line
@@ -471,39 +471,6 @@ cleanup: 
	return err;

}



/**

 * intel_engines_init() - init the Engine Command Streamers

 * @gt: pointer to struct intel_gt

 *

 * Return: non-zero if the initialization failed.

 */

int intel_engines_init(struct intel_gt *gt)

{

	int (*init)(struct intel_engine_cs *engine);

	struct intel_engine_cs *engine;

	enum intel_engine_id id;

	int err;



	if (HAS_EXECLISTS(gt->i915))

		init = intel_execlists_submission_init;

	else

		init = intel_ring_submission_init;



	for_each_engine(engine, gt, id) {

		err = init(engine);

		if (err)

			goto cleanup;



		intel_engine_add_user(engine);

	}



	return 0;



cleanup:

	intel_engines_release(gt);

	return err;

}



void intel_engine_init_execlists(struct intel_engine_cs *engine)

{

	struct intel_engine_execlists * const execlists = &engine->execlists;
@@ -615,7 +582,7 @@ err: 
	return ret;

}



static int intel_engine_setup_common(struct intel_engine_cs *engine)

static int engine_setup_common(struct intel_engine_cs *engine)

{

	int err;
@@ -645,46 +612,6 @@ static int intel_engine_setup_common(struct intel_engine_cs *engine) 
	return 0;

}



/**

 * intel_engines_setup- setup engine state not requiring hw access

 * @gt: pointer to struct intel_gt

 *

 * Initializes engine structure members shared between legacy and execlists

 * submission modes which do not require hardware access.

 *

 * Typically done early in the submission mode specific engine setup stage.

 */

int intel_engines_setup(struct intel_gt *gt)

{

	int (*setup)(struct intel_engine_cs *engine);

	struct intel_engine_cs *engine;

	enum intel_engine_id id;

	int err;



	if (HAS_EXECLISTS(gt->i915))

		setup = intel_execlists_submission_setup;

	else

		setup = intel_ring_submission_setup;



	for_each_engine(engine, gt, id) {

		err = intel_engine_setup_common(engine);

		if (err)

			goto cleanup;



		err = setup(engine);

		if (err)

			goto cleanup;



		GEM_BUG_ON(!engine->cops);

	}



	return 0;



cleanup:

	intel_engines_release(gt);

	return err;

}



struct measure_breadcrumb {

	struct i915_request rq;

	struct intel_timeline timeline;
@@ -802,7 +729,7 @@ create_kernel_context(struct intel_engine_cs *engine) 
 *

 * Returns zero on success or an error code on failure.

 */

int intel_engine_init_common(struct intel_engine_cs *engine)

static int engine_init_common(struct intel_engine_cs *engine)

{

	struct intel_context *ce;

	int ret;
@@ -832,6 +759,37 @@ int intel_engine_init_common(struct intel_engine_cs *engine) 
	return 0;

}



int intel_engines_init(struct intel_gt *gt)

{

	int (*setup)(struct intel_engine_cs *engine);

	struct intel_engine_cs *engine;

	enum intel_engine_id id;

	int err;



	if (HAS_EXECLISTS(gt->i915))

		setup = intel_execlists_submission_setup;

	else

		setup = intel_ring_submission_setup;



	for_each_engine(engine, gt, id) {

		err = engine_setup_common(engine);

		if (err)

			return err;



		err = setup(engine);

		if (err)

			return err;



		err = engine_init_common(engine);

		if (err)

			return err;



		intel_engine_add_user(engine);

	}



	return 0;

}



/**

 * intel_engines_cleanup_common - cleans up the engine state created by

 *                                the common initiailizers.

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

+0 −5
Original line number Diff line number Diff line
@@ -584,10 +584,6 @@ int intel_gt_init(struct intel_gt *gt) 
		goto err_pm;

	}



	err = intel_engines_setup(gt);

	if (err)

		goto err_vm;



	err = intel_engines_init(gt);

	if (err)

		goto err_engines;
@@ -618,7 +614,6 @@ err_uc_init: 
	intel_uc_fini(&gt->uc);

err_engines:

	intel_engines_release(gt);

err_vm:

	i915_vm_put(fetch_and_zero(&gt->vm));

err_pm:

	intel_gt_pm_fini(gt);

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

+5 −15
Original line number Diff line number Diff line
@@ -3863,6 +3863,11 @@ static void rcs_submission_override(struct intel_engine_cs *engine) 


int intel_execlists_submission_setup(struct intel_engine_cs *engine)

{

	struct intel_engine_execlists * const execlists = &engine->execlists;

	struct drm_i915_private *i915 = engine->i915;

	struct intel_uncore *uncore = engine->uncore;

	u32 base = engine->mmio_base;



	tasklet_init(&engine->execlists.tasklet,

		     execlists_submission_tasklet, (unsigned long)engine);

	timer_setup(&engine->execlists.timer, execlists_timeslice, 0);
@@ -3874,21 +3879,6 @@ int intel_execlists_submission_setup(struct intel_engine_cs *engine) 
	if (engine->class == RENDER_CLASS)

		rcs_submission_override(engine);



	return 0;

}



int intel_execlists_submission_init(struct intel_engine_cs *engine)

{

	struct intel_engine_execlists * const execlists = &engine->execlists;

	struct drm_i915_private *i915 = engine->i915;

	struct intel_uncore *uncore = engine->uncore;

	u32 base = engine->mmio_base;

	int ret;



	ret = intel_engine_init_common(engine);

	if (ret)

		return ret;



	if (intel_init_workaround_bb(engine))

		/*

		 * We continue even if we fail to initialize WA batch

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

+0 −1
Original line number Diff line number Diff line
@@ -83,7 +83,6 @@ enum { 
void intel_logical_ring_cleanup(struct intel_engine_cs *engine);



int intel_execlists_submission_setup(struct intel_engine_cs *engine);

int intel_execlists_submission_init(struct intel_engine_cs *engine);



/* Logical Ring Contexts */

/* At the start of the context image is its per-process HWS page */

CRA Git | Maintained and supported by SUSTech CRA and CCSE