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.
Unified · Split
| @@ -1343,12 +1343,6 @@ xehpsdv_gt_workarounds_init(struct intel_gt *gt, struct i915_wa_list *wal) · 1342 unmodified lines | |||
| 1343 | /* Wa_1409757795:xehpsdv */ | 1343 | /* Wa_1409757795:xehpsdv */ |
| 1344 | wa_write_or(wal, SCCGCTL94DC, CG3DDISURB); | 1344 | wa_write_or(wal, SCCGCTL94DC, CG3DDISURB); |
| 1345 | 1345 | ||
| 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 | |||
| 1352 | /* Wa_16011155590:xehpsdv */ | 1346 | /* Wa_16011155590:xehpsdv */ |
| 1353 | if (IS_XEHPSDV_GRAPHICS_STEP(i915, STEP_A0, STEP_B0)) | 1347 | if (IS_XEHPSDV_GRAPHICS_STEP(i915, STEP_A0, STEP_B0)) |
| 1354 | wa_write_or(wal, UNSLICE_UNIT_LEVEL_CLKGATE, | 1348 | 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 | |||
| 1385 | GAMTLBVEBOX0_CLKGATE_DIS); | 1379 | GAMTLBVEBOX0_CLKGATE_DIS); |
| 1386 | } | 1380 | } |
| 1387 | 1381 | ||
| 1388 | /* Wa_14012362059:xehpsdv */ | ||
| 1389 | wa_write_or(wal, GEN12_MERT_MOD_CTRL, FORCE_MISS_FTLB); | ||
| 1390 | |||
| 1391 | /* Wa_16012725990:xehpsdv */ | 1382 | /* Wa_16012725990:xehpsdv */ |
| 1392 | if (IS_XEHPSDV_GRAPHICS_STEP(i915, STEP_A1, STEP_FOREVER)) | 1383 | if (IS_XEHPSDV_GRAPHICS_STEP(i915, STEP_A1, STEP_FOREVER)) |
| 1393 | wa_write_or(wal, UNSLICE_UNIT_LEVEL_CLKGATE, VFUNIT_CLKGATE_DIS); | 1384 | wa_write_or(wal, UNSLICE_UNIT_LEVEL_CLKGATE, VFUNIT_CLKGATE_DIS); |
| 1394 | 1385 | ||
| 1395 | /* Wa_14011060649:xehpsdv */ | 1386 | /* Wa_14011060649:xehpsdv */ |
| 1396 | wa_14011060649(gt, wal); | 1387 | 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); | ||
| 1401 | } | 1388 | } |
| 1402 | 1389 | ||
| 1403 | static void | 1390 | static void |
| @@ -2617,6 +2604,19 @@ general_render_compute_wa_init(struct intel_engine_cs *engine, struct i915_wa_li · 1213 unmodified lines | |||
| 2617 | /* Wa_14010449647:xehpsdv */ | 2604 | /* Wa_14010449647:xehpsdv */ |
| 2618 | wa_masked_en(wal, GEN7_HALF_SLICE_CHICKEN1, | 2605 | wa_masked_en(wal, GEN7_HALF_SLICE_CHICKEN1, |
| 2619 | GEN7_PSD_SINGLE_PORT_DISPATCH_ENABLE); | 2606 | 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); | ||
| 2620 | } | 2620 | } |
| 2621 | } | 2621 | } |
| 2622 | 2622 | ||