drm/i915/cnl: WaPushConstantDereferenceHoldDisable
Subsystems (2)
PATCH 1/1 drm/i915/cnl: WaPushConstantDereferenceHoldDisable
CS sometimes hangs on 3D Push Constant dispatches with the new deref enhancement logic in CNL.
Cc Mika Kuoppala <[email protected]>
Signed-off-by Oscar Mateo <[email protected]>
Reviewed-by Rodrigo Vivi <[email protected]>
--- drivers/gpu/drm/i915/i915_reg.h | 1 + drivers/gpu/drm/i915/intel_engine_cs.c | 3 +++ 2 files changed, 4 insertions(+)
drivers/gpu/drm/i915/i915_reg.h +1 -0
@@ -8055,6 +8055,7 @@ enum {#define GEN7_ROW_CHICKEN2 _MMIO(0xe4f4)#define GEN7_ROW_CHICKEN2_GT2 _MMIO(0xf4f4)#define DOP_CLOCK_GATING_DISABLE (1<<0) +#define PUSH_CONSTANT_DEREF_DISABLE (1<<8)#define HSW_ROW_CHICKEN3 _MMIO(0xe49c)#define HSW_ROW_CHICKEN3_L3_GLOBAL_ATOMICS_DISABLE (1 << 6)
drivers/gpu/drm/i915/intel_engine_cs.c +3 -0
@@ -1083,6 +1083,9 @@ static int cnl_init_workarounds(struct intel_engine_cs *engine)WA_SET_BIT (GEN9_GAMT_ECO_REG_RW_IA ,GAMT_ECO_ENABLE_IN_PLACE_DECOMPRESS ); +/* WaPushConstantDereferenceHoldDisable:cnl */ +WA_SET_BIT (GEN7_ROW_CHICKEN2 ,PUSH_CONSTANT_DEREF_DISABLE ); +/* WaEnablePreemptionGranularityControlByUMD:cnl */ ret=wa_ring_whitelist_reg (engine,GEN8_CS_CHICKEN1 );if (ret)
Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Oops... forgot to add v2 tag. Hang on a second.
Quoted 28 lines · Oscar Mateo
CS sometimes hangs on 3D Push Constant dispatches with the new deref enhancement logic in CNL.
Cc Mika Kuoppala <[email protected]>Signed-off-by Oscar Mateo <[email protected]>Reviewed-by Rodrigo Vivi <[email protected]>--- drivers/gpu/drm/i915/i915_reg.h | 1 + drivers/gpu/drm/i915/intel_engine_cs.c | 3 +++ 2 files changed, 4 insertions(+)drivers/gpu/drm/i915/i915_reg.h +1
-0@@ -8055,6 +8055,7 @@ enum {#define GEN7_ROW_CHICKEN2 _MMIO(0xe4f4)#define GEN7_ROW_CHICKEN2_GT2 _MMIO(0xf4f4)#define DOP_CLOCK_GATING_DISABLE (1<<0) +#define PUSH_CONSTANT_DEREF_DISABLE (1<<8)#define HSW_ROW_CHICKEN3 _MMIO(0xe49c)#define HSW_ROW_CHICKEN3_L3_GLOBAL_ATOMICS_DISABLE (1 << 6)drivers/gpu/drm/i915/intel_engine_cs.c +0
-0
drivers/gpu/drm/i915/intel_engine_cs.c static int cnl_init_workarounds(struct intel_engine_cs *engine) · line 1091
Quoted 9 lines
drivers/gpu/drm/i915/intel_engine_cs.c +3
-0@@ -1083,6 +1083,9 @@ static int cnl_init_workarounds(struct intel_engine_cs *engine)WA_SET_BIT (GEN9_GAMT_ECO_REG_RW_IA ,GAMT_ECO_ENABLE_IN_PLACE_DECOMPRESS ); +/* WaPushConstantDereferenceHoldDisable:cnl */ +WA_SET_BIT (GEN7_ROW_CHICKEN2 ,PUSH_CONSTANT_DEREF_DISABLE ); +/* WaEnablePreemptionGranularityControlByUMD:cnl */ ret=wa_ring_whitelist_reg (engine,GEN8_CS_CHICKEN1 );if (ret)
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx