Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9e01d944 authored by Rodrigo Vivi's avatar Rodrigo Vivi
Browse files

drm/i915: Sort ctx workarounds init from newer to older platforms. 



No functional change. Just a reorg to match the preferred
behavior.

Cc: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Cc: Ville Syrjälä <ville.syrjala@linux.intel.com>
Cc: Lucas De Marchi <lucas.demarchi@intel.com>
Signed-off-by: default avatarRodrigo Vivi <rodrigo.vivi@intel.com>
Reviewed-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Link: https://patchwork.freedesktop.org/patch/msgid/20190221231452.21672-1-rodrigo.vivi@intel.com
parent 07c100b1

drivers/gpu/drm/i915/intel_workarounds.c

+18 −18
Original line number Diff line number Diff line
@@ -564,26 +564,26 @@ void intel_engine_init_ctx_wa(struct intel_engine_cs *engine) 


	wa_init_start(wal, "context");



	if (INTEL_GEN(i915) < 8)

		return;

	else if (IS_BROADWELL(i915))

		bdw_ctx_workarounds_init(engine);

	else if (IS_CHERRYVIEW(i915))

		chv_ctx_workarounds_init(engine);

	else if (IS_SKYLAKE(i915))

		skl_ctx_workarounds_init(engine);

	else if (IS_BROXTON(i915))

		bxt_ctx_workarounds_init(engine);

	else if (IS_KABYLAKE(i915))

		kbl_ctx_workarounds_init(engine);

	else if (IS_GEMINILAKE(i915))

		glk_ctx_workarounds_init(engine);

	else if (IS_COFFEELAKE(i915))

		cfl_ctx_workarounds_init(engine);

	if (IS_ICELAKE(i915))

		icl_ctx_workarounds_init(engine);

	else if (IS_CANNONLAKE(i915))

		cnl_ctx_workarounds_init(engine);

	else if (IS_ICELAKE(i915))

		icl_ctx_workarounds_init(engine);

	else if (IS_COFFEELAKE(i915))

		cfl_ctx_workarounds_init(engine);

	else if (IS_GEMINILAKE(i915))

		glk_ctx_workarounds_init(engine);

	else if (IS_KABYLAKE(i915))

		kbl_ctx_workarounds_init(engine);

	else if (IS_BROXTON(i915))

		bxt_ctx_workarounds_init(engine);

	else if (IS_SKYLAKE(i915))

		skl_ctx_workarounds_init(engine);

	else if (IS_CHERRYVIEW(i915))

		chv_ctx_workarounds_init(engine);

	else if (IS_BROADWELL(i915))

		bdw_ctx_workarounds_init(engine);

	else if (INTEL_GEN(i915) < 8)

		return;

	else

		MISSING_CASE(INTEL_GEN(i915));