History

drm/i915/xehpsdv: Move render/compute engine reset domains related workarounds

Registers that exist in the shared render/compute reset domain need to be placed on an engine workaround list to ensure that they are properly re-applied whenever an RCS or CCS engine is reset. We have a number of workarounds (updating registers MLTICTXCTL, L3SQCREG1_CCS0, GEN12_MERT_MOD_CTRL, and GEN12_GAMCNTRL_CTRL) that are incorrectly implemented on the 'gt' workaround list and need to be moved accordingly.

Srinivasan Shanmugam committed 4 years ago

Commit b2006061 parent ff6b19d1 file · +13 −13Browse files

Unified · Split

drivers/gpu/drm/i915/gt/intel_workarounds.c+13−13
@@ -1343,12 +1343,6 @@ xehpsdv_gt_workarounds_init(struct intel_gt *gt, struct i915_wa_list *wal) · 1342 unmodified lines
13431343 /* Wa_1409757795:xehpsdv */
13441344 wa_write_or(wal, SCCGCTL94DC, CG3DDISURB);
13451345
1346− /* Wa_18011725039:xehpsdv */
1347− if (IS_XEHPSDV_GRAPHICS_STEP(i915, STEP_A1, STEP_B0)) {
1348− wa_masked_dis(wal, MLTICTXCTL, TDONRENDER);
1349− wa_write_or(wal, L3SQCREG1_CCS0, FLUSHALLNONCOH);
1350− }
1351−
13521346 /* Wa_16011155590:xehpsdv */
13531347 if (IS_XEHPSDV_GRAPHICS_STEP(i915, STEP_A0, STEP_B0))
13541348 wa_write_or(wal, UNSLICE_UNIT_LEVEL_CLKGATE,
@@ -1385,19 +1379,12 @@ xehpsdv_gt_workarounds_init(struct intel_gt *gt, struct i915_wa_list *wal) · 30 unmodified lines
13851379 GAMTLBVEBOX0_CLKGATE_DIS);
13861380 }
13871381
1388− /* Wa_14012362059:xehpsdv */
1389− wa_write_or(wal, GEN12_MERT_MOD_CTRL, FORCE_MISS_FTLB);
1390−
13911382 /* Wa_16012725990:xehpsdv */
13921383 if (IS_XEHPSDV_GRAPHICS_STEP(i915, STEP_A1, STEP_FOREVER))
13931384 wa_write_or(wal, UNSLICE_UNIT_LEVEL_CLKGATE, VFUNIT_CLKGATE_DIS);
13941385
13951386 /* Wa_14011060649:xehpsdv */
13961387 wa_14011060649(gt, wal);
1397−
1398− /* Wa_14014368820:xehpsdv */
1399− wa_write_or(wal, GEN12_GAMCNTRL_CTRL, INVALIDATION_BROADCAST_MODE_DIS |
1400− GLOBAL_INVALIDATION_MODE);
14011388 }
14021389
14031390 static void
@@ -2617,6 +2604,19 @@ general_render_compute_wa_init(struct intel_engine_cs *engine, struct i915_wa_li · 1213 unmodified lines
26172604 /* Wa_14010449647:xehpsdv */
26182605 wa_masked_en(wal, GEN7_HALF_SLICE_CHICKEN1,
26192606 GEN7_PSD_SINGLE_PORT_DISPATCH_ENABLE);
2607+
2608+ /* Wa_18011725039:xehpsdv */
2609+ if (IS_XEHPSDV_GRAPHICS_STEP(i915, STEP_A1, STEP_B0)) {
2610+ wa_masked_dis(wal, MLTICTXCTL, TDONRENDER);
2611+ wa_write_or(wal, L3SQCREG1_CCS0, FLUSHALLNONCOH);
2612+ }
2613+
2614+ /* Wa_14012362059:xehpsdv */
2615+ wa_write_or(wal, GEN12_MERT_MOD_CTRL, FORCE_MISS_FTLB);
2616+
2617+ /* Wa_14014368820:xehpsdv */
2618+ wa_write_or(wal, GEN12_GAMCNTRL_CTRL, INVALIDATION_BROADCAST_MODE_DIS |
2619+ GLOBAL_INVALIDATION_MODE);
26202620 }
26212621 }
26222622

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t