Skip to content

Commit d5a1224

Browse files
mattroperodrigovivi
authored andcommitted
drm/i915/gen11: Wa_1408615072/Wa_1407596294 should be on GT list
The UNSLICE_UNIT_LEVEL_CLKGATE register programmed by this workaround has 'BUS' style reset, indicating that it does not lose its value on engine resets. Furthermore, this register is part of the GT forcewake domain rather than the RENDER domain, so it should not be impacted by RCS engine resets. As such, we should implement this on the GT workaround list rather than an engine list. Bspec: 19219 Fixes: 3551ff9 ("drm/i915/gen11: Moving WAs to rcs_engine_wa_init()") Signed-off-by: Matt Roper <[email protected]> Reviewed-by: Gustavo Sousa <[email protected]> Link: https://patchwork.freedesktop.org/patch/msgid/[email protected] (cherry picked from commit 5f21dc0) Signed-off-by: Rodrigo Vivi <[email protected]>
1 parent ceaa837 commit d5a1224

File tree

1 file changed

+7
-7
lines changed

1 file changed

+7
-7
lines changed

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

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1355,6 +1355,13 @@ icl_gt_workarounds_init(struct intel_gt *gt, struct i915_wa_list *wal)
13551355
GAMT_CHKN_BIT_REG,
13561356
GAMT_CHKN_DISABLE_L3_COH_PIPE);
13571357

1358+
/*
1359+
* Wa_1408615072:icl,ehl (vsunit)
1360+
* Wa_1407596294:icl,ehl (hsunit)
1361+
*/
1362+
wa_write_or(wal, UNSLICE_UNIT_LEVEL_CLKGATE,
1363+
VSUNIT_CLKGATE_DIS | HSUNIT_CLKGATE_DIS);
1364+
13581365
/* Wa_1407352427:icl,ehl */
13591366
wa_write_or(wal, UNSLICE_UNIT_LEVEL_CLKGATE2,
13601367
PSDUNIT_CLKGATE_DIS);
@@ -2539,13 +2546,6 @@ rcs_engine_wa_init(struct intel_engine_cs *engine, struct i915_wa_list *wal)
25392546
wa_masked_en(wal, GEN9_CSFE_CHICKEN1_RCS,
25402547
GEN11_ENABLE_32_PLANE_MODE);
25412548

2542-
/*
2543-
* Wa_1408615072:icl,ehl (vsunit)
2544-
* Wa_1407596294:icl,ehl (hsunit)
2545-
*/
2546-
wa_write_or(wal, UNSLICE_UNIT_LEVEL_CLKGATE,
2547-
VSUNIT_CLKGATE_DIS | HSUNIT_CLKGATE_DIS);
2548-
25492549
/*
25502550
* Wa_1408767742:icl[a2..forever],ehl[all]
25512551
* Wa_1605460711:icl[a0..c0]

0 commit comments

Comments
 (0)