Commit f7597e3c authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'drm-intel-fixes-2023-02-16' of... 

Merge tag 'drm-intel-fixes-2023-02-16' of git://anongit.freedesktop.org/drm/drm-intel

 into drm-fixes

- Moving gen11 hw wa to the right place. (Matt)

Signed-off-by: default avatarDave Airlie <airlied@redhat.com>

From: Rodrigo Vivi <rodrigo.vivi@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/Y+47eUvwbafER35/@intel.com
parents a2a04b51 d5a1224a

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

+7 −7
Original line number Diff line number Diff line
@@ -1355,6 +1355,13 @@ icl_gt_workarounds_init(struct intel_gt *gt, struct i915_wa_list *wal) 
		    GAMT_CHKN_BIT_REG,

		    GAMT_CHKN_DISABLE_L3_COH_PIPE);



	/*

	 * Wa_1408615072:icl,ehl  (vsunit)

	 * Wa_1407596294:icl,ehl  (hsunit)

	 */

	wa_write_or(wal, UNSLICE_UNIT_LEVEL_CLKGATE,

		    VSUNIT_CLKGATE_DIS | HSUNIT_CLKGATE_DIS);



	/* Wa_1407352427:icl,ehl */

	wa_write_or(wal, UNSLICE_UNIT_LEVEL_CLKGATE2,

		    PSDUNIT_CLKGATE_DIS);
@@ -2539,13 +2546,6 @@ rcs_engine_wa_init(struct intel_engine_cs *engine, struct i915_wa_list *wal) 
		wa_masked_en(wal, GEN9_CSFE_CHICKEN1_RCS,

			     GEN11_ENABLE_32_PLANE_MODE);



		/*

		 * Wa_1408615072:icl,ehl  (vsunit)

		 * Wa_1407596294:icl,ehl  (hsunit)

		 */

		wa_write_or(wal, UNSLICE_UNIT_LEVEL_CLKGATE,

			    VSUNIT_CLKGATE_DIS | HSUNIT_CLKGATE_DIS);



		/*

		 * Wa_1408767742:icl[a2..forever],ehl[all]

		 * Wa_1605460711:icl[a0..c0]