drm/i915:gen9: Add WA for disable gather at set shader bit
Subsystems (2)
PATCH 1/1 drm/i915:gen9: Add WA for disable gather at set shader bit
This WA doesn't have a name. According to the spec, driver need to reset disable gather at set shader bit in per ctx WA batch. It is to be noted that the default value is already '0' for this bit but we still need to apply this WA because userspace may set it. If userspace really need it to be set then they need to do in every batch.
--- drivers/gpu/drm/i915/i915_reg.h | 1 + drivers/gpu/drm/i915/intel_lrc.c | 9 +++++++++ 2 files changed, 10 insertions(+)
drivers/gpu/drm/i915/i915_reg.h +1 -0
@@ -5834,6 +5834,7 @@ enum skl_disp_power_wells {# define GEN7_CSC1_RHWO_OPT_DISABLE_IN_RCC ((1<<10) | (1<<26))# define GEN9_RHWO_OPTIMIZATION_DISABLE (1<<14)#define COMMON_SLICE_CHICKEN2 0x7014 +#define GEN9_DISABLE_GATHER_SET_SHADER_SLICE (1<<12)# define GEN8_CSC2_SBE_VUE_CACHE_CONSERVATIVE (1<<0)#define HIZ_CHICKEN 0x7018
drivers/gpu/drm/i915/intel_lrc.c +9 -0
@@ -1302,6 +1302,15 @@ static int gen9_init_perctx_bb(struct intel_engine_cs *ring,struct drm_device *dev = ring->dev;uint32_t index =wa_ctx_start (wa_ctx, *offset,CACHELINE_DWORDS ); +/* WaNoName:skl,bxt +* This WA has no name, according to the spec driver needs to reset +* "disable gather at set shader slice" bit in per ctx batch +*/ +wa_ctx_emit (batch, index,MI_LOAD_REGISTER_IMM (1 )); +wa_ctx_emit (batch, index,COMMON_SLICE_CHICKEN2 ); +wa_ctx_emit (batch, index, +_MASKED_BIT_DISABLE (GEN9_DISABLE_GATHER_SET_SHADER_SLICE )); +/* WaSetDisablePixMaskCammingAndRhwoInCommonSliceChicken:skl,bxt */ if ((IS_SKYLAKE (dev) && (INTEL_REVID (dev) <=SKL_REVID_B0 )) || (IS_BROXTON (dev) && (INTEL_REVID (dev) ==BXT_REVID_A0 ))) {
Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 36 lines · Arun Siluvery
This WA doesn't have a name. According to the spec, driver need to reset disable gather at set shader bit in per ctx WA batch. It is to be noted that the default value is already '0' for this bit but we still need to apply this WA because userspace may set it. If userspace really need it to be set then they need to do in every batch.
Cc Ben Widawsky <[email protected]>Cc Mika Kuoppala <[email protected]>Signed-off-by Arun Siluvery <[email protected]>--- drivers/gpu/drm/i915/i915_reg.h | 1 + drivers/gpu/drm/i915/intel_lrc.c | 9 +++++++++ 2 files changed, 10 insertions(+)drivers/gpu/drm/i915/i915_reg.h +1
-0@@ -5834,6 +5834,7 @@ enum skl_disp_power_wells {# define GEN7_CSC1_RHWO_OPT_DISABLE_IN_RCC ((1<<10) | (1<<26))# define GEN9_RHWO_OPTIMIZATION_DISABLE (1<<14)#define COMMON_SLICE_CHICKEN2 0x7014 +#define GEN9_DISABLE_GATHER_SET_SHADER_SLICE (1<<12)# define GEN8_CSC2_SBE_VUE_CACHE_CONSERVATIVE (1<<0)#define HIZ_CHICKEN 0x7018drivers/gpu/drm/i915/intel_lrc.c +2
-0@@ -1302,6 +1302,15 @@ static int gen9_init_perctx_bb(struct intel_engine_cs *ring,struct drm_device *dev = ring->dev;uint32_t index =wa_ctx_start (wa_ctx, *offset,CACHELINE_DWORDS ); +/* WaNoName:skl,bxt +* This WA has no name, according to the spec driver needs to reset
drivers/gpu/drm/i915/intel_lrc.c static int gen9_init_perctx_bb(struct intel_engine_cs *ring, · line 1316
Quoted 10 lines
drivers/gpu/drm/i915/intel_lrc.c +7
-0+* "disable gather at set shader slice" bit in per ctx batch +*/ +wa_ctx_emit (batch, index,MI_LOAD_REGISTER_IMM (1 )); +wa_ctx_emit (batch, index,COMMON_SLICE_CHICKEN2 ); +wa_ctx_emit (batch, index, +_MASKED_BIT_DISABLE (GEN9_DISABLE_GATHER_SET_SHADER_SLICE )); +/* WaSetDisablePixMaskCammingAndRhwoInCommonSliceChicken:skl,bxt */ if ((IS_SKYLAKE (dev) && (INTEL_REVID (dev) <=SKL_REVID_B0 )) || (IS_BROXTON (dev) && (INTEL_REVID (dev) ==BXT_REVID_A0 ))) {
Hmm. I thought we needed this, but looking at the "User Mode Privileged Commands" of the spec, it seems like this register is not allowed to be written. So unless this register is put in a whitelist somewhere in the future, I think it's safe to drop this patch.
As a preventative measure, I don't see this as harmful - but I don't feel I have any authority to suggest whether we keep this in or not.
Signature · 5 lines
Ben Widawsky, Intel Open Source Technology Center _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 44 lines · Ben Widawsky
Quoted 43 lines · Arun Siluvery
This WA doesn't have a name. According to the spec, driver need to reset disable gather at set shader bit in per ctx WA batch. It is to be noted that the default value is already '0' for this bit but we still need to apply this WA because userspace may set it. If userspace really need it to be set then they need to do in every batch.
Cc Ben Widawsky <[email protected]>Cc Mika Kuoppala <[email protected]>Signed-off-by Arun Siluvery <[email protected]>--- drivers/gpu/drm/i915/i915_reg.h | 1 + drivers/gpu/drm/i915/intel_lrc.c | 9 +++++++++ 2 files changed, 10 insertions(+)drivers/gpu/drm/i915/i915_reg.h +1
-0@@ -5834,6 +5834,7 @@ enum skl_disp_power_wells {# define GEN7_CSC1_RHWO_OPT_DISABLE_IN_RCC ((1<<10) | (1<<26))# define GEN9_RHWO_OPTIMIZATION_DISABLE (1<<14)#define COMMON_SLICE_CHICKEN2 0x7014 +#define GEN9_DISABLE_GATHER_SET_SHADER_SLICE (1<<12)# define GEN8_CSC2_SBE_VUE_CACHE_CONSERVATIVE (1<<0)#define HIZ_CHICKEN 0x7018drivers/gpu/drm/i915/intel_lrc.c +9
-0@@ -1302,6 +1302,15 @@ static int gen9_init_perctx_bb(struct intel_engine_cs *ring,struct drm_device *dev = ring->dev;uint32_t index =wa_ctx_start (wa_ctx, *offset,CACHELINE_DWORDS ); +/* WaNoName:skl,bxt +* This WA has no name, according to the spec driver needs to reset +* "disable gather at set shader slice" bit in per ctx batch +*/ +wa_ctx_emit (batch, index,MI_LOAD_REGISTER_IMM (1 )); +wa_ctx_emit (batch, index,COMMON_SLICE_CHICKEN2 ); +wa_ctx_emit (batch, index, +_MASKED_BIT_DISABLE (GEN9_DISABLE_GATHER_SET_SHADER_SLICE )); +
Quoted 8 lines
drivers/gpu/drm/i915/intel_lrc.c static int gen9_init_perctx_bb(struct intel_engine_cs *ring, · line 1316
Quoted 3 lines
drivers/gpu/drm/i915/intel_lrc.c +0
-0/* WaSetDisablePixMaskCammingAndRhwoInCommonSliceChicken:skl,bxt */ if ((IS_SKYLAKE (dev) && (INTEL_REVID (dev) <=SKL_REVID_B0 )) || (IS_BROXTON (dev) && (INTEL_REVID (dev) ==BXT_REVID_A0 ))) {Hmm. I thought we needed this, but looking at the "User Mode Privileged Commands" of the spec, it seems like this register is not allowed to be written. So unless this register is put in a whitelist somewhere in the future, I think it's safe to drop this patch.
We need to whitelist few registers for preemption related WA, this can be added to whitelist if userspace really needs to write to it.
regards
Arun
Quoted 4 lines
As a preventative measure, I don't see this as harmful - but I don't feel I have any authority to suggest whether we keep this in or not.
_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v2 1/1 drm/i915:gen9: Add WA for disable gather at set shader bit
In reply to Arun SiluveryThis WA doesn't have a name. According to WA ID 0555 in spec, driver need to reset disable gather at set shader bit in per ctx WA batch. It is to be noted that the default value is already '0' for this bit but we still need to apply this WA because userspace may set it. If userspace really need it to be set then they need to do in every batch.
--- drivers/gpu/drm/i915/i915_reg.h | 1 + drivers/gpu/drm/i915/intel_lrc.c | 9 +++++++++ 2 files changed, 10 insertions(+)
drivers/gpu/drm/i915/i915_reg.h +1 -0
@@ -5834,6 +5834,7 @@ enum skl_disp_power_wells {# define GEN7_CSC1_RHWO_OPT_DISABLE_IN_RCC ((1<<10) | (1<<26))# define GEN9_RHWO_OPTIMIZATION_DISABLE (1<<14)#define COMMON_SLICE_CHICKEN2 0x7014 +#define GEN9_DISABLE_GATHER_SET_SHADER_SLICE (1<<12)# define GEN8_CSC2_SBE_VUE_CACHE_CONSERVATIVE (1<<0)#define HIZ_CHICKEN 0x7018
drivers/gpu/drm/i915/intel_lrc.c +9 -0
@@ -1305,6 +1305,15 @@ static int gen9_init_perctx_bb(struct intel_engine_cs *ring,struct drm_device *dev = ring->dev;uint32_t index =wa_ctx_start (wa_ctx, *offset,CACHELINE_DWORDS ); +/* WaNoName:skl,bxt +* This WA has no name, WA ID 0555 in spec says, driver needs to reset +* "disable gather at set shader slice" bit in per ctx batch +*/ +wa_ctx_emit (batch, index,MI_LOAD_REGISTER_IMM (1 )); +wa_ctx_emit (batch, index,COMMON_SLICE_CHICKEN2 ); +wa_ctx_emit (batch, index, +_MASKED_BIT_DISABLE (GEN9_DISABLE_GATHER_SET_SHADER_SLICE )); +/* WaSetDisablePixMaskCammingAndRhwoInCommonSliceChicken:skl,bxt */ if ((IS_SKYLAKE (dev) && (INTEL_REVID (dev) <=SKL_REVID_B0 )) || (IS_BROXTON (dev) && (INTEL_REVID (dev) ==BXT_REVID_A0 ))) {
Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Task id: 7158 -------------------------------------Summary-------------------------------------
Platform Delta drm-intel-nightly Series Applied
ILK 302/302 302/302 SNB 315/315 315/315 IVB 336/336 336/336
BYT -1 283/283 282/283
HSW 378/378 378/378
-------------------------------------Detailed-------------------------------------
Platform Test drm-intel-nightly Series Applied
*BYT igt@gem_tiled_partial_pwrite_pread@reads PASS(1) FAIL(1)
Note: You need to pay more attention to line start with '*'
_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v2 1/1 drm/i915:gen9: Add WA for disable gather at set shader bit
In reply to Arun SiluveryThis WA doesn't have a name. According to WA ID 0555 in spec, driver need to reset disable gather at set shader bit in per ctx WA batch. It is to be noted that the default value is already '0' for this bit but we still need to apply this WA because userspace may set it. If userspace really need it to be set then they need to do in every batch.
v2: include WA ID as there is no name (Joonas)
---
This was already sent sometime back today but there was an error at my end, sending it again to be sure. Also using this opportunity to add commit msg history.
drivers/gpu/drm/i915/i915_reg.h | 1 + drivers/gpu/drm/i915/intel_lrc.c | 9 +++++++++ 2 files changed, 10 insertions(+)
drivers/gpu/drm/i915/i915_reg.h +1 -0
@@ -5834,6 +5834,7 @@ enum skl_disp_power_wells {# define GEN7_CSC1_RHWO_OPT_DISABLE_IN_RCC ((1<<10) | (1<<26))# define GEN9_RHWO_OPTIMIZATION_DISABLE (1<<14)#define COMMON_SLICE_CHICKEN2 0x7014 +#define GEN9_DISABLE_GATHER_SET_SHADER_SLICE (1<<12)# define GEN8_CSC2_SBE_VUE_CACHE_CONSERVATIVE (1<<0)#define HIZ_CHICKEN 0x7018
drivers/gpu/drm/i915/intel_lrc.c +9 -0
@@ -1305,6 +1305,15 @@ static int gen9_init_perctx_bb(struct intel_engine_cs *ring,struct drm_device *dev = ring->dev;uint32_t index =wa_ctx_start (wa_ctx, *offset,CACHELINE_DWORDS ); +/* WaNoName:skl,bxt +* This WA has no name, WA ID 0555 in spec says, driver needs to reset +* "disable gather at set shader slice" bit in per ctx batch +*/ +wa_ctx_emit (batch, index,MI_LOAD_REGISTER_IMM (1 )); +wa_ctx_emit (batch, index,COMMON_SLICE_CHICKEN2 ); +wa_ctx_emit (batch, index, +_MASKED_BIT_DISABLE (GEN9_DISABLE_GATHER_SET_SHADER_SLICE )); +/* WaSetDisablePixMaskCammingAndRhwoInCommonSliceChicken:skl,bxt */ if ((IS_SKYLAKE (dev) && (INTEL_REVID (dev) <=SKL_REVID_B0 )) || (IS_BROXTON (dev) && (INTEL_REVID (dev) ==BXT_REVID_A0 ))) {
Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Task id: 7158 -------------------------------------Summary-------------------------------------
Platform Delta drm-intel-nightly Series Applied
ILK 302/302 302/302 SNB 315/315 315/315 IVB 336/336 336/336
BYT -1 283/283 282/283
HSW 378/378 378/378
-------------------------------------Detailed-------------------------------------
Platform Test drm-intel-nightly Series Applied
*BYT igt@gem_tiled_partial_pwrite_pread@reads PASS(1) FAIL(1)
Note: You need to pay more attention to line start with '*'
_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx