Skip to contentSkip to conversation

drm/i915/gen9: Add WaDisableGatherAtSetShaderCommonSlice

PATCH In review Mika Kuoppala 4 participants 4 messages Jun 16, 2016 – Jul 20, 2016

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 drm/i915/gen9: Add WaDisableGatherAtSetShaderCommonSlice

Add WaDisableGatherAtSetShaderCommonSlice for all gen9 as stated by bspec.

References: HSD#2135817

---
 drivers/gpu/drm/i915/i915_reg.h  | 1 +
 drivers/gpu/drm/i915/intel_lrc.c | 7 +++++++
 2 files changed, 8 insertions(+)
drivers/gpu/drm/i915/i915_reg.h +1 -0
index d229a83ad70a..ff87d0b58d91 100644
@@ -6117,6 +6117,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			_MMIO(0x7014)
+# define GEN9_DISABLE_GATHER_AT_SET_SHADER_COMMON_SLICE (1<<12)
 # define GEN8_SBE_DISABLE_REPLAY_BUF_OPTIMIZATION (1<<8)
 # define GEN8_CSC2_SBE_VUE_CACHE_CONSERVATIVE	(1<<0)
 
drivers/gpu/drm/i915/intel_lrc.c +7 -0
index 4fad8303648e..f4c7f7e6d523 100644
@@ -1285,6 +1285,13 @@ static int gen9_init_perctx_bb(struct intel_engine_cs *engine,
 {
 	uint32_t index = wa_ctx_start(wa_ctx, *offset, CACHELINE_DWORDS);
 
+	/* WaDisableGatherAtSetShaderCommonSlice:skl,bxt,kbl */
+	wa_ctx_emit(batch, index, MI_LOAD_REGISTER_IMM(1));
+	wa_ctx_emit_reg(batch, index, COMMON_SLICE_CHICKEN2);
+	wa_ctx_emit(batch, index, _MASKED_BIT_DISABLE(
+			    GEN9_DISABLE_GATHER_AT_SET_SHADER_COMMON_SLICE));
+	wa_ctx_emit(batch, index, MI_NOOP);
+
 	/* WaSetDisablePixMaskCammingAndRhwoInCommonSliceChicken:skl,bxt */
 	if (IS_SKL_REVID(engine->i915, 0, SKL_REVID_B0) ||
 	    IS_BXT_REVID(engine->i915, 0, BXT_REVID_A1)) {
Signature · 6 lines
2.7.4

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
#1 lore raw

✗ Ro.CI.BAT: warning for drm/i915/gen9: Add WaDisableGatherAtSetShaderCommonSlice

== Series Details ==

== Series Details ==

Series: drm/i915/gen9: Add WaDisableGatherAtSetShaderCommonSlice
URL : https://patchwork.freedesktop.org/series/8788/
State : warning

== Summary ==

Series 8788v1 drm/i915/gen9: Add WaDisableGatherAtSetShaderCommonSlice
http://patchwork.freedesktop.org/api/1.0/series/8788/revisions/1/mbox

Test kms_flip:

        Subgroup basic-flip-vs-dpms:
                pass       -> SKIP       (fi-bdw-i7-5557u)
        Subgroup basic-flip-vs-modeset:
                pass       -> SKIP       (fi-bdw-i7-5557u)
        Subgroup basic-flip-vs-wf_vblank:
                pass       -> SKIP       (fi-bdw-i7-5557u)
        Subgroup basic-plain-flip:
                pass       -> SKIP       (fi-bdw-i7-5557u)
Test kms_frontbuffer_tracking:
        Subgroup basic:
                pass       -> SKIP       (fi-bdw-i7-5557u)
Test kms_pipe_crc_basic:
        Subgroup hang-read-crc-pipe-a:
                pass       -> SKIP       (fi-bdw-i7-5557u)
        Subgroup hang-read-crc-pipe-b:
                pass       -> SKIP       (fi-bdw-i7-5557u)
        Subgroup hang-read-crc-pipe-c:
                pass       -> SKIP       (fi-bdw-i7-5557u)
        Subgroup nonblocking-crc-pipe-a:
                pass       -> SKIP       (fi-bdw-i7-5557u)
        Subgroup nonblocking-crc-pipe-a-frame-sequence:
                pass       -> SKIP       (fi-bdw-i7-5557u)
        Subgroup nonblocking-crc-pipe-b:
                pass       -> SKIP       (fi-bdw-i7-5557u)
        Subgroup nonblocking-crc-pipe-b-frame-sequence:
                pass       -> SKIP       (fi-bdw-i7-5557u)
        Subgroup nonblocking-crc-pipe-c:
                pass       -> SKIP       (fi-bdw-i7-5557u)
        Subgroup nonblocking-crc-pipe-c-frame-sequence:
                pass       -> SKIP       (fi-bdw-i7-5557u)
        Subgroup read-crc-pipe-a:
                pass       -> SKIP       (fi-bdw-i7-5557u)
        Subgroup read-crc-pipe-a-frame-sequence:
                pass       -> SKIP       (fi-bdw-i7-5557u)
        Subgroup read-crc-pipe-b:
                pass       -> SKIP       (fi-bdw-i7-5557u)
        Subgroup read-crc-pipe-b-frame-sequence:
                pass       -> SKIP       (fi-bdw-i7-5557u)
        Subgroup read-crc-pipe-c:
                pass       -> SKIP       (fi-bdw-i7-5557u)
        Subgroup read-crc-pipe-c-frame-sequence:
                pass       -> SKIP       (fi-bdw-i7-5557u)
        Subgroup suspend-read-crc-pipe-a:
                pass       -> SKIP       (fi-bdw-i7-5557u)
        Subgroup suspend-read-crc-pipe-b:
                pass       -> SKIP       (fi-bdw-i7-5557u)
                skip       -> DMESG-WARN (ro-bdw-i5-5250u)
        Subgroup suspend-read-crc-pipe-c:
                pass       -> SKIP       (fi-bdw-i7-5557u)
Test pm_rpm:
        Subgroup basic-pci-d3-state:
                pass       -> SKIP       (fi-bdw-i7-5557u)
        Subgroup basic-rte:
                pass       -> SKIP       (fi-bdw-i7-5557u)
fi-bdw-i7-5557u  total:213  pass:176  dwarn:0   dfail:0   fail:0   skip:37 
fi-skl-i7-6700k  total:213  pass:188  dwarn:0   dfail:0   fail:0   skip:25 
ro-bdw-i5-5250u  total:213  pass:197  dwarn:2   dfail:0   fail:0   skip:14 
ro-bdw-i7-5557U  total:213  pass:198  dwarn:0   dfail:0   fail:0   skip:15 
ro-bdw-i7-5600u  total:213  pass:185  dwarn:0   dfail:0   fail:0   skip:28 
ro-bsw-n3050     total:213  pass:172  dwarn:0   dfail:0   fail:2   skip:39 
ro-byt-n2820     total:213  pass:173  dwarn:0   dfail:0   fail:3   skip:37 
ro-hsw-i3-4010u  total:213  pass:190  dwarn:0   dfail:0   fail:0   skip:23 
ro-hsw-i7-4770r  total:213  pass:190  dwarn:0   dfail:0   fail:0   skip:23 
ro-ilk-i7-620lm  total:213  pass:150  dwarn:0   dfail:0   fail:1   skip:62 
ro-ilk1-i5-650   total:208  pass:150  dwarn:0   dfail:0   fail:1   skip:57 
ro-ivb-i7-3770   total:213  pass:181  dwarn:0   dfail:0   fail:0   skip:32 
ro-ivb2-i7-3770  total:213  pass:185  dwarn:0   dfail:0   fail:0   skip:28 
ro-skl3-i5-6260u total:213  pass:201  dwarn:1   dfail:0   fail:0   skip:11 
ro-snb-i7-2620M  total:213  pass:174  dwarn:0   dfail:0   fail:1   skip:38 

fi-hsw-i7-4770k failed to connect after reboot
fi-skl-i5-6260u failed to connect after reboot
fi-snb-i7-2600 failed to connect after reboot

Results at /archive/results/CI_IGT_test/RO_Patchwork_1196/

3eb202e drm-intel-nightly: 2016y-06m-16d-12h-38m-37s UTC integration manifest 3913bd5 drm/i915/gen9: Add WaDisableGatherAtSetShaderCommonSlice

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

#3 lore raw
In reply to Mika Kuoppala
Quoted 27 lines · Mika Kuoppala

Add WaDisableGatherAtSetShaderCommonSlice for all gen9 as stated by bspec.

References: HSD#2135817

---
  drivers/gpu/drm/i915/i915_reg.h  | 1 +
  drivers/gpu/drm/i915/intel_lrc.c | 7 +++++++
  2 files changed, 8 insertions(+)
drivers/gpu/drm/i915/i915_reg.h +1 -0
index d229a83ad70a..ff87d0b58d91 100644
@@ -6117,6 +6117,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			_MMIO(0x7014)
+# define GEN9_DISABLE_GATHER_AT_SET_SHADER_COMMON_SLICE (1<<12)
  # define GEN8_SBE_DISABLE_REPLAY_BUF_OPTIMIZATION (1<<8)
  # define GEN8_CSC2_SBE_VUE_CACHE_CONSERVATIVE	(1<<0)
 
drivers/gpu/drm/i915/intel_lrc.c +0 -0
index 4fad8303648e..f4c7f7e6d523 100644

drivers/gpu/drm/i915/intel_lrc.c static int gen9_init_perctx_bb(struct intel_engine_cs *engine, · line 1294

Quoted 10 lines
drivers/gpu/drm/i915/intel_lrc.c +7 -0
@@ -1285,6 +1285,13 @@ static int gen9_init_perctx_bb(struct intel_engine_cs *engine,
  {
  	uint32_t index = wa_ctx_start(wa_ctx, *offset, CACHELINE_DWORDS);
 
+	/* WaDisableGatherAtSetShaderCommonSlice:skl,bxt,kbl */
+	wa_ctx_emit(batch, index, MI_LOAD_REGISTER_IMM(1));
+	wa_ctx_emit_reg(batch, index, COMMON_SLICE_CHICKEN2);
+	wa_ctx_emit(batch, index, _MASKED_BIT_DISABLE(
+			    GEN9_DISABLE_GATHER_AT_SET_SHADER_COMMON_SLICE));
+	wa_ctx_emit(batch, index, MI_NOOP);
+

The documentation says it is perctx wa batch but it is not correct, I got a clarification internally and they are trying to get it corrected. This needs to be applied in indirect context wa batch.

regards
Arun

drivers/gpu/drm/i915/intel_lrc.c static int gen9_init_perctx_bb(struct intel_engine_cs *engine, · line 1297

Quoted 4 lines
drivers/gpu/drm/i915/intel_lrc.c +0 -0
  	/* WaSetDisablePixMaskCammingAndRhwoInCommonSliceChicken:skl,bxt */
  	if (IS_SKL_REVID(engine->i915, 0, SKL_REVID_B0) ||
  	    IS_BXT_REVID(engine->i915, 0, BXT_REVID_A1)) {

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx