drm/i915: Implement WaDisableVFclkgate.
Subsystems (2)
PATCH 1/2 drm/i915: Implement WaDisableVFclkgate.
This workaround supposedly fixes some hangs in the VF unit.
--- drivers/gpu/drm/i915/i915_reg.h | 3 +++ drivers/gpu/drm/i915/intel_pm.c | 5 +++++ 2 files changed, 8 insertions(+)
drivers/gpu/drm/i915/i915_reg.h +3 -0
@@ -3875,6 +3875,9 @@ enum {#define SARBUNIT_CLKGATE_DIS (1 << 5)#define RCCUNIT_CLKGATE_DIS (1 << 7) +#define UNSLICE_UNIT_LEVEL_CLOCK _MMIO(0x9434) +#define VFUNIT_CLKGATE_DIS (1 << 20) +/* * Display engine regs */
drivers/gpu/drm/i915/intel_pm.c +5 -0
@@ -8446,6 +8446,11 @@ static void cnl_init_clock_gating(struct drm_i915_private *dev_priv)if (IS_CNL_REVID (dev_priv,CNL_REVID_A0 ,CNL_REVID_B0 )) val |=SARBUNIT_CLKGATE_DIS ;I915_WRITE (SLICE_UNIT_LEVEL_CLKGATE , val); + +/* WaDisableVFclkgate:cnl */ + val =I915_READ (UNSLICE_UNIT_LEVEL_CLOCK ); + val |=VFUNIT_CLKGATE_DIS ; +I915_WRITE (UNSLICE_UNIT_LEVEL_CLOCK , val); }static void cfl_init_clock_gating (struct drm_i915_private *dev_priv)
Signature · 6 lines
2.13.6 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 2/2 drm/i915: Implement WaDisableEarlyEOT.
There seems to be another clock gating issue which the workaround is described as:
"WA: Set 0xE4F0[1] = 1 to disable Early EOT of thread."
--- 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
@@ -8145,6 +8145,7 @@ enum {#define PARTIAL_INSTRUCTION_SHOOTDOWN_DISABLE (1<<8)#define STALL_DOP_GATING_DISABLE (1<<5)#define THROTTLE_12_5 (7<<2) +#define DISABLE_EARLY_EOT (1<<1)#define GEN7_ROW_CHICKEN2 _MMIO(0xe4f4)#define GEN7_ROW_CHICKEN2_GT2 _MMIO(0xf4f4)
drivers/gpu/drm/i915/intel_engine_cs.c +3 -0
@@ -1272,6 +1272,9 @@ static int cnl_init_workarounds(struct intel_engine_cs *engine)if (ret)return ret; +/* WaDisableEarlyEOT:cnl */ +WA_SET_BIT_MASKED (GEN8_ROW_CHICKEN ,DISABLE_EARLY_EOT ); +return 0 ; }
Signature · 6 lines
2.13.6 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 2/2] drm/i915: Implement WaDisableEarlyEOT.
Quoted 6 lines · Rafael Antognolli
There seems to be another clock gating issue which the workaround is described as:
"WA: Set 0xE4F0[1] = 1 to disable Early EOT of thread."
Signed-off-by Rafael Antognolli <[email protected]>
Lucas De Marchi
Quoted 38 lines
--- 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@@ -8145,6 +8145,7 @@ enum {#define PARTIAL_INSTRUCTION_SHOOTDOWN_DISABLE (1<<8)#define STALL_DOP_GATING_DISABLE (1<<5)#define THROTTLE_12_5 (7<<2) +#define DISABLE_EARLY_EOT (1<<1)#define GEN7_ROW_CHICKEN2 _MMIO(0xe4f4)#define GEN7_ROW_CHICKEN2_GT2 _MMIO(0xf4f4)drivers/gpu/drm/i915/intel_engine_cs.c +3
-1@@ -1272,6 +1272,9 @@ static int cnl_init_workarounds(struct intel_engine_cs *engine)if (ret)return ret; +/* WaDisableEarlyEOT:cnl */ +WA_SET_BIT_MASKED (GEN8_ROW_CHICKEN ,DISABLE_EARLY_EOT ); +return 0 ; } --2.13.6
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Signature · 5 lines
Lucas De Marchi _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✓ Fi.CI.BAT: success for series starting with [1/2] drm/i915: Implement WaDisableVFclkgate.
In reply to Rafael Antognolli== Series Details ==
== Series Details ==
Series: series starting with [1/2] drm/i915: Implement WaDisableVFclkgate.
URL : https://patchwork.freedesktop.org/series/34785/
State : success
== Summary ==
Series 34785v1 series starting with [1/2] drm/i915: Implement WaDisableVFclkgate.
https://patchwork.freedesktop.org/api/1.0/series/34785/revisions/1/mbox/
Test debugfs_test:
Subgroup read_all_entries:
pass -> DMESG-WARN (fi-elk-e7500) fdo#103989 +1
Test kms_pipe_crc_basic:
Subgroup suspend-read-crc-pipe-b:
incomplete -> PASS (fi-snb-2520m) fdo#103713fdo#103989 https://bugs.freedesktop.org/show_bug.cgi?id=103989
fdo#103713 https://bugs.freedesktop.org/show_bug.cgi?id=103713
fi-bdw-5557u total:288 pass:267 dwarn:0 dfail:0 fail:0 skip:21 time:437s fi-bdw-gvtdvm total:288 pass:264 dwarn:0 dfail:0 fail:0 skip:24 time:444s fi-blb-e6850 total:288 pass:223 dwarn:1 dfail:0 fail:0 skip:64 time:381s fi-bsw-n3050 total:288 pass:242 dwarn:0 dfail:0 fail:0 skip:46 time:517s fi-bwr-2160 total:288 pass:183 dwarn:0 dfail:0 fail:0 skip:105 time:284s fi-bxt-dsi total:288 pass:258 dwarn:0 dfail:0 fail:0 skip:30 time:504s fi-bxt-j4205 total:288 pass:259 dwarn:0 dfail:0 fail:0 skip:29 time:510s fi-byt-j1900 total:288 pass:253 dwarn:0 dfail:0 fail:0 skip:35 time:486s fi-byt-n2820 total:288 pass:249 dwarn:0 dfail:0 fail:0 skip:39 time:472s fi-elk-e7500 total:224 pass:163 dwarn:15 dfail:0 fail:0 skip:45 fi-glk-1 total:288 pass:260 dwarn:0 dfail:0 fail:0 skip:28 time:536s fi-hsw-4770 total:288 pass:261 dwarn:0 dfail:0 fail:0 skip:27 time:370s fi-hsw-4770r total:288 pass:224 dwarn:0 dfail:0 fail:0 skip:64 time:262s fi-ilk-650 total:288 pass:228 dwarn:0 dfail:0 fail:0 skip:60 time:390s fi-ivb-3520m total:288 pass:259 dwarn:0 dfail:0 fail:0 skip:29 time:488s fi-ivb-3770 total:288 pass:259 dwarn:0 dfail:0 fail:0 skip:29 time:445s fi-kbl-7500u total:288 pass:263 dwarn:1 dfail:0 fail:0 skip:24 time:485s fi-kbl-7560u total:288 pass:269 dwarn:0 dfail:0 fail:0 skip:19 time:534s fi-kbl-7567u total:288 pass:268 dwarn:0 dfail:0 fail:0 skip:20 time:478s fi-kbl-r total:288 pass:261 dwarn:0 dfail:0 fail:0 skip:27 time:530s fi-pnv-d510 total:288 pass:222 dwarn:1 dfail:0 fail:0 skip:65 time:588s fi-skl-6260u total:288 pass:268 dwarn:0 dfail:0 fail:0 skip:20 time:451s fi-skl-6600u total:288 pass:261 dwarn:0 dfail:0 fail:0 skip:27 time:545s fi-skl-6700hq total:288 pass:262 dwarn:0 dfail:0 fail:0 skip:26 time:566s fi-skl-6700k total:288 pass:264 dwarn:0 dfail:0 fail:0 skip:24 time:516s fi-skl-6770hq total:288 pass:268 dwarn:0 dfail:0 fail:0 skip:20 time:496s fi-skl-gvtdvm total:288 pass:265 dwarn:0 dfail:0 fail:0 skip:23 time:448s fi-snb-2520m total:288 pass:249 dwarn:0 dfail:0 fail:0 skip:39 time:548s fi-snb-2600 total:288 pass:248 dwarn:0 dfail:0 fail:0 skip:40 time:414s Blacklisted hosts: fi-cfl-s2 total:288 pass:262 dwarn:0 dfail:0 fail:0 skip:26 time:608s fi-glk-dsi total:288 pass:258 dwarn:0 dfail:0 fail:0 skip:30 time:491s
5cac595012ce8ad67dfa837982ead06fe9535bad drm-tip: 2017y-12m-01d-23h-12m-37s UTC integration manifest 645347857d80 drm/i915: Implement WaDisableEarlyEOT.a5569960b691 drm/i915: Implement WaDisableVFclkgate.
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_7393/
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✗ Fi.CI.IGT: failure for series starting with [1/2] drm/i915: Implement WaDisableVFclkgate.
In reply to Rafael Antognolli== Series Details ==
== Series Details ==
Series: series starting with [1/2] drm/i915: Implement WaDisableVFclkgate.
URL : https://patchwork.freedesktop.org/series/34785/
State : failure
== Summary ==
Test drv_module_reload:
Subgroup basic-reload:
dmesg-warn -> PASS (shard-hsw) fdo#102707 +1
Test kms_flip:
Subgroup dpms-vs-vblank-race:
pass -> FAIL (shard-hsw) fdo#103060
Test kms_frontbuffer_tracking:
Subgroup fbc-1p-offscren-pri-shrfb-draw-render:
pass -> FAIL (shard-snb) fdo#101623
Test kms_plane:
Subgroup plane-panning-bottom-right-suspend-pipe-a-planes:
pass -> INCOMPLETE (shard-hsw)fdo#102707 https://bugs.freedesktop.org/show_bug.cgi?id=102707
fdo#103060 https://bugs.freedesktop.org/show_bug.cgi?id=103060
fdo#101623 https://bugs.freedesktop.org/show_bug.cgi?id=101623
shard-hsw total:2639 pass:1527 dwarn:1 dfail:0 fail:11 skip:1098 time:9005s shard-snb total:2663 pass:1308 dwarn:2 dfail:0 fail:12 skip:1341 time:8147s Blacklisted hosts: shard-apl total:2663 pass:1692 dwarn:1 dfail:0 fail:21 skip:949 time:13674s shard-kbl total:2588 pass:1750 dwarn:1 dfail:0 fail:22 skip:815 time:10592s
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_7393/shards.html
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Hi,
Quoted 13 lines · Rafael Antognolli
This workaround supposedly fixes some hangs in the VF unit.
Signed-off-by Rafael Antognolli <[email protected]>--- drivers/gpu/drm/i915/i915_reg.h | 3 +++ drivers/gpu/drm/i915/intel_pm.c | 5 +++++ 2 files changed, 8 insertions(+)drivers/gpu/drm/i915/i915_reg.h +0
-0
drivers/gpu/drm/i915/i915_reg.h enum { · line 3878
Quoted 4 lines
drivers/gpu/drm/i915/i915_reg.h +1
-0@@ -3875,6 +3875,9 @@ enum {#define SARBUNIT_CLKGATE_DIS (1 << 5)#define RCCUNIT_CLKGATE_DIS (1 << 7) +#define UNSLICE_UNIT_LEVEL_CLOCK _MMIO(0x9434)
I think this should follow the other names
(UNSLICE_UNIT_LEVEL_CLKGATE). Otherwise it LGTM.
Lucas De Marchi
Quoted 28 lines
drivers/gpu/drm/i915/i915_reg.h +2
-0+#define VFUNIT_CLKGATE_DIS (1 << 20) +/* * Display engine regs */ drivers/gpu/drm/i915/intel_pm.c +5
-1@@ -8446,6 +8446,11 @@ static void cnl_init_clock_gating(struct drm_i915_private *dev_priv)if (IS_CNL_REVID (dev_priv,CNL_REVID_A0 ,CNL_REVID_B0 )) val |=SARBUNIT_CLKGATE_DIS ;I915_WRITE (SLICE_UNIT_LEVEL_CLKGATE , val); + +/* WaDisableVFclkgate:cnl */ + val =I915_READ (UNSLICE_UNIT_LEVEL_CLOCK ); + val |=VFUNIT_CLKGATE_DIS ; +I915_WRITE (UNSLICE_UNIT_LEVEL_CLOCK , val); }static void cfl_init_clock_gating (struct drm_i915_private *dev_priv) --2.13.6
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Signature · 5 lines
Lucas De Marchi _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx