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.
v2: Improve the commit message (Rodrigo)
--- 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
Patchwork
CI✓ Fi.CI.BAT: success for drm/i915/cnl: WaPushConstantDereferenceHoldDisable (rev3)
== Series Details ==
== Series Details ==
Series: drm/i915/cnl: WaPushConstantDereferenceHoldDisable (rev3)
URL : https://patchwork.freedesktop.org/series/29182/
State : success
== Summary ==
Series 29182v3 drm/i915/cnl: WaPushConstantDereferenceHoldDisable
https://patchwork.freedesktop.org/api/1.0/series/29182/revisions/3/mbox/
fi-bdw-5557u total:279 pass:268 dwarn:0 dfail:0 fail:0 skip:11 time:457s fi-bdw-gvtdvm total:279 pass:265 dwarn:0 dfail:0 fail:0 skip:14 time:432s fi-blb-e6850 total:279 pass:224 dwarn:1 dfail:0 fail:0 skip:54 time:364s fi-bsw-n3050 total:279 pass:243 dwarn:0 dfail:0 fail:0 skip:36 time:565s fi-bwr-2160 total:279 pass:184 dwarn:0 dfail:0 fail:0 skip:95 time:252s fi-bxt-j4205 total:279 pass:260 dwarn:0 dfail:0 fail:0 skip:19 time:525s fi-byt-j1900 total:279 pass:254 dwarn:1 dfail:0 fail:0 skip:24 time:530s fi-byt-n2820 total:279 pass:250 dwarn:1 dfail:0 fail:0 skip:28 time:527s fi-elk-e7500 total:279 pass:230 dwarn:0 dfail:0 fail:0 skip:49 time:441s fi-glk-2a total:279 pass:260 dwarn:0 dfail:0 fail:0 skip:19 time:615s fi-hsw-4770 total:279 pass:263 dwarn:0 dfail:0 fail:0 skip:16 time:449s fi-hsw-4770r total:279 pass:263 dwarn:0 dfail:0 fail:0 skip:16 time:425s fi-ilk-650 total:279 pass:229 dwarn:0 dfail:0 fail:0 skip:50 time:424s fi-ivb-3520m total:279 pass:261 dwarn:0 dfail:0 fail:0 skip:18 time:502s fi-ivb-3770 total:279 pass:261 dwarn:0 dfail:0 fail:0 skip:18 time:474s fi-kbl-7500u total:279 pass:261 dwarn:0 dfail:0 fail:0 skip:18 time:481s fi-kbl-7560u total:279 pass:269 dwarn:0 dfail:0 fail:0 skip:10 time:600s fi-kbl-r total:279 pass:261 dwarn:0 dfail:0 fail:0 skip:18 time:600s fi-pnv-d510 total:279 pass:223 dwarn:1 dfail:0 fail:0 skip:55 time:523s fi-skl-6260u total:279 pass:269 dwarn:0 dfail:0 fail:0 skip:10 time:467s fi-skl-6700k total:279 pass:261 dwarn:0 dfail:0 fail:0 skip:18 time:477s fi-skl-6770hq total:279 pass:269 dwarn:0 dfail:0 fail:0 skip:10 time:493s fi-skl-gvtdvm total:279 pass:266 dwarn:0 dfail:0 fail:0 skip:13 time:444s fi-skl-x1585l total:279 pass:269 dwarn:0 dfail:0 fail:0 skip:10 time:510s fi-snb-2520m total:279 pass:251 dwarn:0 dfail:0 fail:0 skip:28 time:550s fi-snb-2600 total:279 pass:250 dwarn:0 dfail:0 fail:0 skip:29 time:408s
2964b2f4029594399c4e3c28d64c504dcd914ab4 drm-tip: 2017y-08m-23d-13h-11m-32s UTC integration manifest 5db90af9b7d7 drm/i915/cnl: WaPushConstantDereferenceHoldDisable
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_5477/
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Rodrigo Vivi
Appliedmerged to dinq. thanks for the patch and for updating the commit message.
Quoted 46 lines · Oscar Mateo
CS sometimes hangs on 3D Push Constant dispatches with the new deref enhancement logic in CNL.
v2: Improve the commit message (Rodrigo)
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
-1@@ -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) --1.9.1
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Signature · 6 lines
Rodrigo Vivi Blog: http://blog.vivi.eng.br _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx