Commit ac54c826 authored by Lucas De Marchi's avatar Lucas De Marchi
Browse files

drm/i915/dg1: make Wa_22010271021 permanent 



Just like for rkl and tgl, this should be permanent as well for dg1
instead just for A0. The commit making it permanent for those platforms
ended up "racing" with the commit adding the DG1 WAs, so now fix that up.

v2: Add "tgl,dg1" to WA comment (Matt)

Cc: Swathi Dhanavanthri <swathi.dhanavanthri@intel.com>
Signed-off-by: default avatarLucas De Marchi <lucas.demarchi@intel.com>
Reviewed-by: default avatarMatt Roper <matthew.d.roper@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20201027043228.696518-3-lucas.demarchi@intel.com
parent 19384452

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

+8 −8
Original line number Diff line number Diff line
@@ -1770,6 +1770,14 @@ rcs_engine_wa_init(struct intel_engine_cs *engine, struct i915_wa_list *wal) 
		 */

		wa_write_or(wal, GEN7_FF_THREAD_MODE,

			    GEN12_FF_TESSELATION_DOP_GATE_DISABLE);



		/*

		 * Wa_1606700617:tgl,dg1

		 * Wa_22010271021:tgl,rkl,dg1

		 */

		wa_masked_en(wal,

			     GEN9_CS_DEBUG_MODE1,

			     FF_DOP_CLOCK_GATE_DISABLE);

	}



	if (IS_DG1_REVID(i915, DG1_REVID_A0, DG1_REVID_A0) ||
@@ -1798,14 +1806,6 @@ rcs_engine_wa_init(struct intel_engine_cs *engine, struct i915_wa_list *wal) 
			     GEN6_RC_SLEEP_PSMI_CONTROL,

			     GEN12_WAIT_FOR_EVENT_POWER_DOWN_DISABLE |

			     GEN8_RC_SEMA_IDLE_MSG_DISABLE);



		/*

		 * Wa_1606700617:tgl

		 * Wa_22010271021:tgl,rkl

		 */

		wa_masked_en(wal,

			     GEN9_CS_DEBUG_MODE1,

			     FF_DOP_CLOCK_GATE_DISABLE);

	}



	if (IS_GEN(i915, 12)) {