Commit ab9e2f77 authored by Chris Wilson's avatar Chris Wilson
Browse files

drm/i915/gt: Pull engine w/a initialisation into common 



We need to setup the workarounds on all engines, with the knowledge
about which platforms each workaround applies to kept together in the
workaround list. As such, we can pull the w/a initialisation into the
common setup and try to avoid duplicating knowledge about when to setup
the workarounds.

Signed-off-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Cc: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Reviewed-by: default avatarTvrtko Ursulin <tvrtko.ursulin@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20190703135805.7310-2-chris@chris-wilson.co.uk
parent 4a54da35

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

+0 −1
Original line number Diff line number Diff line
@@ -657,7 +657,6 @@ int i915_gem_contexts_init(struct drm_i915_private *dev_priv) 
	GEM_BUG_ON(dev_priv->kernel_context);

	GEM_BUG_ON(dev_priv->preempt_context);



	intel_engine_init_ctx_wa(dev_priv->engine[RCS0]);

	init_contexts(dev_priv);



	/* lowest priority; idle task */

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

+4 −0
Original line number Diff line number Diff line
@@ -636,6 +636,10 @@ static int intel_engine_setup_common(struct intel_engine_cs *engine) 
	engine->sseu =

		intel_sseu_from_device_info(&RUNTIME_INFO(engine->i915)->sseu);



	intel_engine_init_workarounds(engine);

	intel_engine_init_whitelist(engine);

	intel_engine_init_ctx_wa(engine);



	return 0;

}

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

+0 −3
Original line number Diff line number Diff line
@@ -2807,9 +2807,6 @@ int intel_execlists_submission_init(struct intel_engine_cs *engine) 
	if (ret)

		return ret;



	intel_engine_init_workarounds(engine);

	intel_engine_init_whitelist(engine);



	if (intel_init_workaround_bb(engine))

		/*

		 * We continue even if we fail to initialize WA batch

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

+1 −1
Original line number Diff line number Diff line
@@ -1364,7 +1364,7 @@ void intel_engine_init_workarounds(struct intel_engine_cs *engine) 
{

	struct i915_wa_list *wal = &engine->wa_list;



	if (GEM_WARN_ON(INTEL_GEN(engine->i915) < 8))

	if (INTEL_GEN(engine->i915) < 8)

		return;



	wa_init_start(wal, engine->name);

CRA Git | Maintained and supported by SUSTech CRA and CCSE