i915: pm: Be less agressive with clockfreq changes on Bay Trail
Subsystems (2)
PATCH 1/1 i915: pm: Be less agressive with clockfreq changes on Bay Trail
Bay Trail devices are known to hang when changing the frequency often, this is discussed in great length in:
https://bugzilla.kernel.org/show_bug.cgi?id=109051
Commit 6067a27d1f01 ("drm/i915: Avoid tweaking evaluation thresholds on Baytrail v3") is an attempt to workaround this. Several users in bko109051 report that an earlier version of this patch, v1:
https://bugzilla.kernel.org/attachment.cgi?id=251471
Works better for them and they still see hangs with the merged v3.
Comparing the 2 versions shows that they are indeed not equivalent, v1 not only skips writing the GEN6_RP* registers from valleyview_set_rps, as v3 does. It also contained these modifications to i915_irq.c:
if (pm_iir & GEN6_PM_RP_DOWN_EI_EXPIRED) {
if (!vlv_c0_above(dev_priv,
&dev_priv->rps.down_ei, &now,
- dev_priv->rps.down_threshold))
+ VLV_RP_DOWN_EI_THRESHOLD))
events |= GEN6_PM_RP_DOWN_THRESHOLD;
dev_priv->rps.down_ei = now;
}
if (pm_iir & GEN6_PM_RP_UP_EI_EXPIRED) {
if (vlv_c0_above(dev_priv,
&dev_priv->rps.up_ei, &now,
- dev_priv->rps.up_threshold))
+ VLV_RP_UP_EI_THRESHOLD))
events |= GEN6_PM_RP_UP_THRESHOLD;
dev_priv->rps.up_ei = now;
}Which use less aggressive up/down thresholds, which results in less GEN6_PM_RP_*_THRESHOLD events and thus in less calls to intel_set_rps() -> valleyview_set_rps() -> vlv_punit_write(PUNIT_REG_GPU_FREQ_REQ). With the last call being the likely cause of the hang.
This commit hardcodes the threshold_up and _down values for Bay Trail to less aggressive values, reducing the amount of clock frequency changes, thus avoiding the hangs some people are still seeing with the merged fix.
--- drivers/gpu/drm/i915/i915_reg.h | 3 +++ drivers/gpu/drm/i915/intel_pm.c | 5 ++++- 2 files changed, 7 insertions(+), 1 deletion(-)
drivers/gpu/drm/i915/i915_reg.h +3 -0
@@ -1355,6 +1355,9 @@ enum i915_power_well_id {#define VLV_BIAS_CPU_125_SOC_875 (6 << 2)#define CHV_BIAS_CPU_50_SOC_50 (3 << 2) +#define VLV_RP_UP_EI_THRESHOLD 90 +#define VLV_RP_DOWN_EI_THRESHOLD 70 +/* vlv2 north clock has */ #define CCK_FUSE_REG 0x8#define CCK_FUSE_HPLL_FREQ_MASK 0x3
drivers/gpu/drm/i915/intel_pm.c +4 -1
@@ -6096,8 +6096,11 @@ static void gen6_set_rps_thresholds(struct drm_i915_private *dev_priv, u8 val)/* When byt can survive without system hang with dynamic * sw freq adjustments, this restriction can be lifted. */ -if (IS_VALLEYVIEW (dev_priv)) +if (IS_VALLEYVIEW (dev_priv)) { + threshold_up =VLV_RP_UP_EI_THRESHOLD ; + threshold_down =VLV_RP_DOWN_EI_THRESHOLD ; goto skip_hw_write; + }I915_WRITE (GEN6_RP_UP_EI ,GT_INTERVAL_FROM_US (dev_priv, ei_up));
Signature · 6 lines
2.14.3 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✗ Fi.CI.BAT: warning for i915: pm: Be less agressive with clockfreq changes on Bay Trail
== Series Details ==
== Series Details ==
Series: i915: pm: Be less agressive with clockfreq changes on Bay Trail
URL : https://patchwork.freedesktop.org/series/33541/
State : warning
== Summary ==
Series 33541v1 i915: pm: Be less agressive with clockfreq changes on Bay Trail
https://patchwork.freedesktop.org/api/1.0/series/33541/revisions/1/mbox/
Test chamelium:
Subgroup dp-crc-fast:
fail -> PASS (fi-kbl-7500u) fdo#102514
Test kms_pipe_crc_basic:
Subgroup read-crc-pipe-a-frame-sequence:
skip -> PASS (fi-hsw-4770r)
Test drv_module_reload:
Subgroup basic-reload-inject:
pass -> DMESG-WARN (fi-bsw-n3050)fdo#102514 https://bugs.freedesktop.org/show_bug.cgi?id=102514
fi-bdw-5557u total:289 pass:268 dwarn:0 dfail:0 fail:0 skip:21 time:444s fi-bdw-gvtdvm total:289 pass:265 dwarn:0 dfail:0 fail:0 skip:24 time:450s fi-blb-e6850 total:289 pass:223 dwarn:1 dfail:0 fail:0 skip:65 time:383s fi-bsw-n3050 total:289 pass:242 dwarn:1 dfail:0 fail:0 skip:46 time:536s fi-bwr-2160 total:289 pass:183 dwarn:0 dfail:0 fail:0 skip:106 time:273s fi-bxt-dsi total:289 pass:259 dwarn:0 dfail:0 fail:0 skip:30 time:499s fi-bxt-j4205 total:289 pass:260 dwarn:0 dfail:0 fail:0 skip:29 time:506s fi-byt-j1900 total:289 pass:254 dwarn:0 dfail:0 fail:0 skip:35 time:503s fi-byt-n2820 total:289 pass:250 dwarn:0 dfail:0 fail:0 skip:39 time:486s fi-elk-e7500 total:289 pass:229 dwarn:0 dfail:0 fail:0 skip:60 time:428s fi-gdg-551 total:289 pass:178 dwarn:1 dfail:0 fail:1 skip:109 time:263s fi-glk-1 total:289 pass:261 dwarn:0 dfail:0 fail:0 skip:28 time:542s fi-hsw-4770 total:289 pass:262 dwarn:0 dfail:0 fail:0 skip:27 time:431s fi-hsw-4770r total:289 pass:262 dwarn:0 dfail:0 fail:0 skip:27 time:439s fi-ilk-650 total:289 pass:228 dwarn:0 dfail:0 fail:0 skip:61 time:426s fi-ivb-3520m total:289 pass:260 dwarn:0 dfail:0 fail:0 skip:29 time:479s fi-ivb-3770 total:289 pass:260 dwarn:0 dfail:0 fail:0 skip:29 time:459s fi-kbl-7500u total:289 pass:264 dwarn:1 dfail:0 fail:0 skip:24 time:489s fi-kbl-7560u total:289 pass:270 dwarn:0 dfail:0 fail:0 skip:19 time:522s fi-kbl-7567u total:289 pass:269 dwarn:0 dfail:0 fail:0 skip:20 time:473s fi-kbl-r total:289 pass:262 dwarn:0 dfail:0 fail:0 skip:27 time:534s fi-pnv-d510 total:289 pass:222 dwarn:1 dfail:0 fail:0 skip:66 time:576s fi-skl-6260u total:289 pass:269 dwarn:0 dfail:0 fail:0 skip:20 time:458s fi-skl-6600u total:289 pass:262 dwarn:0 dfail:0 fail:0 skip:27 time:542s fi-skl-6700hq total:289 pass:263 dwarn:0 dfail:0 fail:0 skip:26 time:561s fi-skl-6700k total:289 pass:265 dwarn:0 dfail:0 fail:0 skip:24 time:523s fi-skl-6770hq total:289 pass:269 dwarn:0 dfail:0 fail:0 skip:20 time:493s fi-skl-gvtdvm total:289 pass:266 dwarn:0 dfail:0 fail:0 skip:23 time:465s fi-snb-2520m total:289 pass:250 dwarn:0 dfail:0 fail:0 skip:39 time:562s fi-snb-2600 total:289 pass:249 dwarn:0 dfail:0 fail:0 skip:40 time:419s Blacklisted hosts: fi-cfl-s total:289 pass:254 dwarn:3 dfail:0 fail:0 skip:32 time:539s fi-cnl-y total:289 pass:262 dwarn:0 dfail:0 fail:0 skip:27 time:554s fi-glk-dsi total:289 pass:259 dwarn:0 dfail:0 fail:0 skip:30 time:492s
bd1f3f04014b597b479785e6125d8bde41939c8c drm-tip: 2017y-11m-09d-18h-20m-22s UTC integration manifest 3a3586f80f37 i915: pm: Be less agressive with clockfreq changes on Bay Trail
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_7042/
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoting Hans de Goede (2017-11-09 18:51:01)
Quoted 68 lines
Bay Trail devices are known to hang when changing the frequency often, this is discussed in great length in:
https://bugzilla.kernel.org/show_bug.cgi?id=109051Commit
6067a27d1f01("drm/i915: Avoid tweaking evaluation thresholds on Baytrail v3") is an attempt to workaround this. Several users in bko109051 report that an earlier version of this patch, v1:
https://bugzilla.kernel.org/attachment.cgi?id=251471Works better for them and they still see hangs with the merged v3.
Comparing the 2 versions shows that they are indeed not equivalent, v1 not only skips writing the GEN6_RP* registers from
valleyview_set_rps, as v3 does. It also contained these modifications toi915_irq.c:if (pm_iir & GEN6_PM_RP_DOWN_EI_EXPIRED) { if (!vlv_c0_above(dev_priv, &dev_priv->rps.down_ei, &now,(quoted diff) +2
-2- dev_priv->rps.down_threshold)) + VLV_RP_DOWN_EI_THRESHOLD)) events |= GEN6_PM_RP_DOWN_THRESHOLD; dev_priv->rps.down_ei = now; } if (pm_iir & GEN6_PM_RP_UP_EI_EXPIRED) { if (vlv_c0_above(dev_priv, &dev_priv->rps.up_ei, &now, - dev_priv->rps.up_threshold)) + VLV_RP_UP_EI_THRESHOLD)) events |= GEN6_PM_RP_UP_THRESHOLD; dev_priv->rps.up_ei = now; }Which use less aggressive up/down thresholds, which results in less GEN6_PM_RP_*_THRESHOLD events and thus in less calls to
intel_set_rps()->valleyview_set_rps()->vlv_punit_write(PUNIT_REG_GPU_FREQ_REQ). With the last call being the likely cause of the hang.This commit hardcodes the
threshold_upand_downvalues for Bay Trail to less aggressive values, reducing the amount of clock frequency changes, thus avoiding the hangs some people are still seeing with the merged fix.Signed-off-by Hans de Goede <[email protected]>--- drivers/gpu/drm/i915/i915_reg.h | 3 +++ drivers/gpu/drm/i915/intel_pm.c | 5 ++++- 2 files changed, 7 insertions(+), 1 deletion(-)drivers/gpu/drm/i915/i915_reg.h +3
-0@@ -1355,6 +1355,9 @@ enum i915_power_well_id {#define VLV_BIAS_CPU_125_SOC_875 (6 << 2)#define CHV_BIAS_CPU_50_SOC_50 (3 << 2) +#define VLV_RP_UP_EI_THRESHOLD 90 +#define VLV_RP_DOWN_EI_THRESHOLD 70 +/* vlv2 north clock has */ #define CCK_FUSE_REG 0x8#define CCK_FUSE_HPLL_FREQ_MASK 0x3drivers/gpu/drm/i915/intel_pm.c +0
-0
drivers/gpu/drm/i915/intel_pm.c static void gen6_set_rps_thresholds(struct drm_i915_private *dev_priv, u8 val) · line 6101
Quoted 7 lines
drivers/gpu/drm/i915/intel_pm.c +3
-1@@ -6096,8 +6096,11 @@ static void gen6_set_rps_thresholds(struct drm_i915_private *dev_priv, u8 val)/* When byt can survive without system hang with dynamic * sw freq adjustments, this restriction can be lifted. */ -if (IS_VALLEYVIEW (dev_priv)) +if (IS_VALLEYVIEW (dev_priv)) { + threshold_up =VLV_RP_UP_EI_THRESHOLD ; + threshold_down =VLV_RP_DOWN_EI_THRESHOLD ;
Basically you want a limit on the frequency of ... pcode access? As presented, you ultimately do not trust any write and the only solution is to disable all writes. No RPS whatsoever, run at max and hope rc6 works (maybe even decrease the rc6 threshold).
One of the ideas we floated was moving the pcode access to a worker and ratelimiting the updates.
-Chris
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Hi,
Quoted 82 lines · Chris Wilson
Quoting Hans de Goede (2017-11-09 18:51:01)
Quoted 68 lines
Bay Trail devices are known to hang when changing the frequency often, this is discussed in great length in:
https://bugzilla.kernel.org/show_bug.cgi?id=109051Commit
6067a27d1f01("drm/i915: Avoid tweaking evaluation thresholds on Baytrail v3") is an attempt to workaround this. Several users in bko109051 report that an earlier version of this patch, v1:
https://bugzilla.kernel.org/attachment.cgi?id=251471Works better for them and they still see hangs with the merged v3.
Comparing the 2 versions shows that they are indeed not equivalent, v1 not only skips writing the GEN6_RP* registers from
valleyview_set_rps, as v3 does. It also contained these modifications toi915_irq.c:if (pm_iir & GEN6_PM_RP_DOWN_EI_EXPIRED) { if (!vlv_c0_above(dev_priv, &dev_priv->rps.down_ei, &now,(quoted diff) +2
-2- dev_priv->rps.down_threshold)) + VLV_RP_DOWN_EI_THRESHOLD)) events |= GEN6_PM_RP_DOWN_THRESHOLD; dev_priv->rps.down_ei = now; } if (pm_iir & GEN6_PM_RP_UP_EI_EXPIRED) { if (vlv_c0_above(dev_priv, &dev_priv->rps.up_ei, &now, - dev_priv->rps.up_threshold)) + VLV_RP_UP_EI_THRESHOLD)) events |= GEN6_PM_RP_UP_THRESHOLD; dev_priv->rps.up_ei = now; }Which use less aggressive up/down thresholds, which results in less GEN6_PM_RP_*_THRESHOLD events and thus in less calls to
intel_set_rps()->valleyview_set_rps()->vlv_punit_write(PUNIT_REG_GPU_FREQ_REQ). With the last call being the likely cause of the hang.This commit hardcodes the
threshold_upand_downvalues for Bay Trail to less aggressive values, reducing the amount of clock frequency changes, thus avoiding the hangs some people are still seeing with the merged fix.Signed-off-by Hans de Goede <[email protected]>--- drivers/gpu/drm/i915/i915_reg.h | 3 +++ drivers/gpu/drm/i915/intel_pm.c | 5 ++++- 2 files changed, 7 insertions(+), 1 deletion(-)drivers/gpu/drm/i915/i915_reg.h +3
-0@@ -1355,6 +1355,9 @@ enum i915_power_well_id {#define VLV_BIAS_CPU_125_SOC_875 (6 << 2)#define CHV_BIAS_CPU_50_SOC_50 (3 << 2) +#define VLV_RP_UP_EI_THRESHOLD 90 +#define VLV_RP_DOWN_EI_THRESHOLD 70 +/* vlv2 north clock has */ #define CCK_FUSE_REG 0x8#define CCK_FUSE_HPLL_FREQ_MASK 0x3drivers/gpu/drm/i915/intel_pm.c +0
-0drivers/gpu/drm/i915/intel_pm.c static void gen6_set_rps_thresholds(struct drm_i915_private *dev_priv, u8 val) · line 6101
Quoted 7 lines
drivers/gpu/drm/i915/intel_pm.c +3
-1@@ -6096,8 +6096,11 @@ static void gen6_set_rps_thresholds(struct drm_i915_private *dev_priv, u8 val)/* When byt can survive without system hang with dynamic * sw freq adjustments, this restriction can be lifted. */ -if (IS_VALLEYVIEW (dev_priv)) +if (IS_VALLEYVIEW (dev_priv)) { + threshold_up =VLV_RP_UP_EI_THRESHOLD ; + threshold_down =VLV_RP_DOWN_EI_THRESHOLD ;Basically you want a limit on the frequency of ... pcode access? As presented, you ultimately do not trust any write and the only solution is to disable all writes. No RPS whatsoever, run at max and hope rc6 works (maybe even decrease the rc6 threshold).
Quoted 2 lines
One of the ideas we floated was moving the pcode access to a worker and ratelimiting the updates.
Yes ratelimiting the amount of vlv_punit_write(PUNIT_REG_GPU_FREQ_REQ) calls is also something which came to my mind as an alternative solution.
As I tried to explain in the commit message my main inspiration for this patch was that people were reporting different success rates with v1 and v3 of the Commit 6067a27d1f01 ("drm/i915: Avoid tweaking evaluation thresholds on Baytrail v3") patch.
Regards,
Hans
Quoted 2 lines
-Chris
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx