|
|
|
@ -1118,6 +1118,8 @@ static int intel_logical_ring_workarounds_emit(struct drm_i915_gem_request *req) |
|
|
|
|
batch[__index] = (cmd); \
|
|
|
|
|
} while (0) |
|
|
|
|
|
|
|
|
|
#define wa_ctx_emit_reg(batch, index, reg) \ |
|
|
|
|
wa_ctx_emit((batch), (index), (reg)) |
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
|
* In this WA we need to set GEN8_L3SQCREG4[21:21] and reset it after |
|
|
|
@ -1152,12 +1154,12 @@ static inline int gen8_emit_flush_coherentl3_wa(struct intel_engine_cs *ring, |
|
|
|
|
|
|
|
|
|
wa_ctx_emit(batch, index, (MI_STORE_REGISTER_MEM_GEN8 | |
|
|
|
|
MI_SRM_LRM_GLOBAL_GTT)); |
|
|
|
|
wa_ctx_emit(batch, index, GEN8_L3SQCREG4); |
|
|
|
|
wa_ctx_emit_reg(batch, index, GEN8_L3SQCREG4); |
|
|
|
|
wa_ctx_emit(batch, index, ring->scratch.gtt_offset + 256); |
|
|
|
|
wa_ctx_emit(batch, index, 0); |
|
|
|
|
|
|
|
|
|
wa_ctx_emit(batch, index, MI_LOAD_REGISTER_IMM(1)); |
|
|
|
|
wa_ctx_emit(batch, index, GEN8_L3SQCREG4); |
|
|
|
|
wa_ctx_emit_reg(batch, index, GEN8_L3SQCREG4); |
|
|
|
|
wa_ctx_emit(batch, index, l3sqc4_flush); |
|
|
|
|
|
|
|
|
|
wa_ctx_emit(batch, index, GFX_OP_PIPE_CONTROL(6)); |
|
|
|
@ -1170,7 +1172,7 @@ static inline int gen8_emit_flush_coherentl3_wa(struct intel_engine_cs *ring, |
|
|
|
|
|
|
|
|
|
wa_ctx_emit(batch, index, (MI_LOAD_REGISTER_MEM_GEN8 | |
|
|
|
|
MI_SRM_LRM_GLOBAL_GTT)); |
|
|
|
|
wa_ctx_emit(batch, index, GEN8_L3SQCREG4); |
|
|
|
|
wa_ctx_emit_reg(batch, index, GEN8_L3SQCREG4); |
|
|
|
|
wa_ctx_emit(batch, index, ring->scratch.gtt_offset + 256); |
|
|
|
|
wa_ctx_emit(batch, index, 0); |
|
|
|
|
|
|
|
|
@ -1341,7 +1343,7 @@ static int gen9_init_perctx_bb(struct intel_engine_cs *ring, |
|
|
|
|
if (IS_SKL_REVID(dev, 0, SKL_REVID_B0) || |
|
|
|
|
IS_BXT_REVID(dev, 0, BXT_REVID_A1)) { |
|
|
|
|
wa_ctx_emit(batch, index, MI_LOAD_REGISTER_IMM(1)); |
|
|
|
|
wa_ctx_emit(batch, index, GEN9_SLICE_COMMON_ECO_CHICKEN0); |
|
|
|
|
wa_ctx_emit_reg(batch, index, GEN9_SLICE_COMMON_ECO_CHICKEN0); |
|
|
|
|
wa_ctx_emit(batch, index, |
|
|
|
|
_MASKED_BIT_ENABLE(DISABLE_PIXEL_MASK_CAMMING)); |
|
|
|
|
wa_ctx_emit(batch, index, MI_NOOP); |
|
|
|
|