drm/i915/psr: Lockless version of psr_wait_for_idle
Subsystems (2)
PATCH v5 1/2 drm/i915/psr: Lockless version of psr_wait_for_idle
This is a lockless version of the exisiting psr_wait_for_idle(). We want to wait for PSR to idle out inside intel_pipe_update_start. At the time of a pipe update, we should never race with any psr enable or disable code, which is a part of crtc enable/disable. So, we can live w/o taking any psr locks at all.
The follow up patch will use this lockless wait inside pipe_update_ start to wait for PSR to idle out before checking for vblank evasion.
Even if psr is never enabled, psr2_enabled will be false and this function will wait for PSR1 to idle out, which should just return immediately, so a very short (~1-2 usec) wait for cases where PSR is disabled.
v2: Add comment to explain the 25msec timeout (DK)
v3: Rename psr_wait_for_idle to __psr_wait_for_idle_locked to avoid
naming conflicts and propagate err (if any) to the caller (Chris)
v5: Form a series with the next patch
--- drivers/gpu/drm/i915/intel_drv.h | 1 + drivers/gpu/drm/i915/intel_psr.c | 25 +++++++++++++++++++++++-- 2 files changed, 24 insertions(+), 2 deletions(-)
drivers/gpu/drm/i915/intel_drv.h +1 -0
@@ -1920,6 +1920,7 @@ void intel_psr_compute_config(struct intel_dp *intel_dp, struct intel_crtc_state *crtc_state);void intel_psr_irq_control (struct drm_i915_private *dev_priv,bool debug);void intel_psr_irq_handler (struct drm_i915_private *dev_priv,u32 psr_iir); +int intel_psr_wait_for_idle (struct drm_i915_private *dev_priv);/* intel_runtime_pm.c */ int intel_power_domains_init (struct drm_i915_private *);
drivers/gpu/drm/i915/intel_psr.c +23 -2
@@ -757,7 +757,28 @@ void intel_psr_disable(struct intel_dp *intel_dp,cancel_work_sync (&dev_priv->psr.work); } -static bool psr_wait_for_idle (struct drm_i915_private *dev_priv) +int intel_psr_wait_for_idle (struct drm_i915_private *dev_priv) +{ +i915_reg_t reg; +u32 mask; + +if (dev_priv->psr.psr2_enabled) { + reg =EDP_PSR2_STATUS ; + mask =EDP_PSR2_STATUS_STATE_MASK ; + }else { + reg =EDP_PSR_STATUS ; + mask =EDP_PSR_STATUS_STATE_MASK ; + } + +/* +* The 25 msec timeout accounts for a frame @ 60Hz refresh rate, +* exit training an aux handshake time. +*/ +return intel_wait_for_register (dev_priv, reg, mask, +EDP_PSR_STATUS_STATE_IDLE ,25 ); +} + +static bool __psr_wait_for_idle_locked (struct drm_i915_private *dev_priv) {struct intel_dp *intel_dp;i915_reg_t reg;
@@ -803,7 +824,7 @@ static void intel_psr_work(struct work_struct *work)* PSR might take some time to get fully disabled * and be ready for re-enable. */ -if (!psr_wait_for_idle (dev_priv)) +if (!__psr_wait_for_idle_locked (dev_priv)) goto unlock;/*
Signature · 6 lines
2.13.5 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v5 2/2 drm/i915: Wait for PSR exit before checking for vblank evasion
The PIPEDSL freezes on PSR entry and if PSR hasn't fully exited, then the pipe_update_start call schedules itself out to check back later.
On ChromeOS-4.4 kernel, which is fairly up-to-date w.r.t drm/i915 but lags w.r.t core kernel code, hot plugging an external display triggers tons of "potential atomic update errors" in the dmesg, on *pipe A*. A closer analysis reveals that we try to read the scanline 3 times and eventually timeout, b/c PSR hasn't exited fully leading to a PIPEDSL stuck @ 1599. This issue is not seen on upstream kernels, b/c for *some* reason we loop inside intel_pipe_update start for ~2+ msec which in this case is more than enough to exit PSR fully, hence an *unstuck* PIPEDSL counter, hence no error. On the other hand, the ChromeOS kernel spends ~1.1 msec looping inside intel_pipe_update_start and hence errors out b/c the source is still in PSR.
Regardless, we should wait for PSR exit (if PSR is disabled, we incur a ~1-2 usec penalty) before reading the PIPEDSL, b/c if we haven't fully exited PSR, then checking for vblank evasion isn't actually applicable.
v4: Comment explaining psr_wait after enabling VBL interrupts (DK)
v5: CAN_PSR() to handle platforms that don't support PSR.
--- drivers/gpu/drm/i915/intel_sprite.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-)
drivers/gpu/drm/i915/intel_sprite.c +10 -2
@@ -107,14 +107,22 @@ void intel_pipe_update_start(const struct intel_crtc_state *new_crtc_state) VBLANK_EVASION_TIME_US); max = vblank_start -1 ; -local_irq_disable (); -if (min <=0 || max <=0 )return ;if (WARN_ON (drm_crtc_vblank_get (&crtc->base)))return ; +/* +* Wait for psr to idle out after enabling the VBL interrupts +* VBL interrupts will start the PSR exit and prevent a PSR +* re-entry as well. +*/ +if (CAN_PSR (dev_priv) &&intel_psr_wait_for_idle (dev_priv)) +DRM_ERROR ("PSR idle timed out, atomic update may fail\n" ); + +local_irq_disable (); + crtc->debug.min_vbl = min; crtc->debug.max_vbl = max;trace_i915_pipe_update_start (crtc);
Signature · 6 lines
2.13.5 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH v5 2/2] drm/i915: Wait for PSR exit before checking for vblank evasion
Quoting Tarun Vyas (2018-06-25 08:09:18)
Quoted 44 lines
The PIPEDSL freezes on PSR entry and if PSR hasn't fully exited, then the
pipe_update_startcall schedules itself out to check back later.On ChromeOS-4.4 kernel, which is fairly up-to-date w.r.t drm/i915 but lags w.r.t core kernel code, hot plugging an external display triggers tons of "potential atomic update errors" in the dmesg, on *pipe A*. A closer analysis reveals that we try to read the scanline 3 times and eventually timeout, b/c PSR hasn't exited fully leading to a PIPEDSL stuck @ 1599. This issue is not seen on upstream kernels, b/c for *some* reason we loop inside
intel_pipe_updatestart for ~2+ msec which in this case is more than enough to exit PSR fully, hence an *unstuck* PIPEDSL counter, hence no error. On the other hand, the ChromeOS kernel spends ~1.1 msec looping insideintel_pipe_update_startand hence errors out b/c the source is still in PSR.Regardless, we should wait for PSR exit (if PSR is disabled, we incur a ~1-2 usec penalty) before reading the PIPEDSL, b/c if we haven't fully exited PSR, then checking for vblank evasion isn't actually applicable.
v4: Comment explaining
psr_waitafter enabling VBL interrupts (DK)v5:
CAN_PSR()to handle platforms that don't support PSR.Signed-off-by Tarun Vyas <[email protected]>--- drivers/gpu/drm/i915/intel_sprite.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-)drivers/gpu/drm/i915/intel_sprite.c +0
-2@@ -107,14 +107,22 @@ void intel_pipe_update_start(const struct intel_crtc_state *new_crtc_state) VBLANK_EVASION_TIME_US); max = vblank_start -1 ; -local_irq_disable (); -if (min <=0 || max <=0 )return ;if (WARN_ON (drm_crtc_vblank_get (&crtc->base)))return ;
drivers/gpu/drm/i915/intel_sprite.c void intel_pipe_update_start(const struct intel_crtc_state *new_crtc_state) · line 124
Quoted 10 lines
drivers/gpu/drm/i915/intel_sprite.c +9
-0+/* +* Wait for psr to idle out after enabling the VBL interrupts +* VBL interrupts will start the PSR exit and prevent a PSR +* re-entry as well. +*/ +if (CAN_PSR (dev_priv) &&intel_psr_wait_for_idle (dev_priv)) +DRM_ERROR ("PSR idle timed out, atomic update may fail\n" ); + +local_irq_disable ();
The function must return with irqs disabled as the update_end is always called to re-enable irqs.
The pair of early returns may be unjustified, but they still do exist... -Chris
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH v5 2/2] drm/i915: Wait for PSR exit before checking for vblank evasion
Quoted 59 lines · Chris Wilson
Quoting Tarun Vyas (2018-06-25 08:09:18)
Quoted 44 lines
The PIPEDSL freezes on PSR entry and if PSR hasn't fully exited, then the
pipe_update_startcall schedules itself out to check back later.On ChromeOS-4.4 kernel, which is fairly up-to-date w.r.t drm/i915 but lags w.r.t core kernel code, hot plugging an external display triggers tons of "potential atomic update errors" in the dmesg, on *pipe A*. A closer analysis reveals that we try to read the scanline 3 times and eventually timeout, b/c PSR hasn't exited fully leading to a PIPEDSL stuck @ 1599. This issue is not seen on upstream kernels, b/c for *some* reason we loop inside
intel_pipe_updatestart for ~2+ msec which in this case is more than enough to exit PSR fully, hence an *unstuck* PIPEDSL counter, hence no error. On the other hand, the ChromeOS kernel spends ~1.1 msec looping insideintel_pipe_update_startand hence errors out b/c the source is still in PSR.Regardless, we should wait for PSR exit (if PSR is disabled, we incur a ~1-2 usec penalty) before reading the PIPEDSL, b/c if we haven't fully exited PSR, then checking for vblank evasion isn't actually applicable.
v4: Comment explaining
psr_waitafter enabling VBL interrupts (DK)v5:
CAN_PSR()to handle platforms that don't support PSR.Signed-off-by Tarun Vyas <[email protected]>--- drivers/gpu/drm/i915/intel_sprite.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-)drivers/gpu/drm/i915/intel_sprite.c +0
-2@@ -107,14 +107,22 @@ void intel_pipe_update_start(const struct intel_crtc_state *new_crtc_state) VBLANK_EVASION_TIME_US); max = vblank_start -1 ; -local_irq_disable (); -if (min <=0 || max <=0 )return ;if (WARN_ON (drm_crtc_vblank_get (&crtc->base)))return ;drivers/gpu/drm/i915/intel_sprite.c void intel_pipe_update_start(const struct intel_crtc_state *new_crtc_state) · line 124
Quoted 10 lines
drivers/gpu/drm/i915/intel_sprite.c +9
-0+/* +* Wait for psr to idle out after enabling the VBL interrupts +* VBL interrupts will start the PSR exit and prevent a PSR +* re-entry as well. +*/ +if (CAN_PSR (dev_priv) &&intel_psr_wait_for_idle (dev_priv)) +DRM_ERROR ("PSR idle timed out, atomic update may fail\n" ); + +local_irq_disable ();The function must return with irqs disabled as the
update_endis always called to re-enable irqs.
Quoted 2 lines
The pair of early returns may be unjustified, but they still do exist... -Chris
Oops ! Missed it, will handle in v6 :( . I am curious as to how the atomic update will go ahead in the event of these early returns.
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✓ Fi.CI.BAT: success for series starting with [v5,1/2] drm/i915/psr: Lockless version of psr_wait_for_idle
In reply to Tarun Vyas== Series Details ==
== Series Details ==
Series: series starting with [v5,1/2] drm/i915/psr: Lockless version of psr_wait_for_idle
URL : https://patchwork.freedesktop.org/series/45319/
State : success
== Summary ==
= CI Bug Log - changes from CI_DRM_4372 -> Patchwork_9409 =
== Summary - SUCCESS ==
No regressions found.
External URL: https://patchwork.freedesktop.org/api/1.0/series/45319/revisions/1/mbox/
== Changes ==
No changes found
== Participating hosts (41 -> 36) ==
Additional (2): fi-bxt-dsi fi-snb-2520m
Missing (7): fi-ilk-m540 fi-hsw-4200u fi-byt-squawks fi-glk-dsi fi-bsw-cyan fi-ctg-p8600 fi-kbl-x1275
== Build changes ==
* Linux: CI_DRM_4372 -> Patchwork_9409
CI_DRM_4372: d4ce215cacf172e6b8f1424d3750ea116c3c4abe @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_4529: 23d50a49413aff619d00ec50fc2e051e9b45baa5 @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_9409: fb8a552362c004a39371cdd0487f8c45c728341d @ git://anongit.freedesktop.org/gfx-ci/linux
== Linux commits ==
fb8a552362c0 drm/i915: Wait for PSR exit before checking for vblank evasion ac5801b05307 drm/i915/psr: Lockless version of psr_wait_for_idle
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_9409/issues.html
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✗ Fi.CI.IGT: failure for series starting with [v5,1/2] drm/i915/psr: Lockless version of psr_wait_for_idle
In reply to Tarun Vyas== Series Details ==
== Series Details ==
Series: series starting with [v5,1/2] drm/i915/psr: Lockless version of psr_wait_for_idle
URL : https://patchwork.freedesktop.org/series/45319/
State : failure
== Summary ==
= CI Bug Log - changes from CI_DRM_4372_full -> Patchwork_9409_full =
== Summary - FAILURE ==
Serious unknown changes coming with Patchwork_9409_full absolutely need to be verified manually.
If you think the reported changes have nothing to do with the changes introduced in Patchwork_9409_full, please notify your bug team to allow them to document this new failure mode, which will reduce false positives in CI.
== Possible new issues ==
Here are the unknown changes that may have been introduced in Patchwork_9409_full:
=== IGT changes ===
==== Possible regressions ====
igt@drv_selftest@live_hangcheck:
shard-snb: PASS -> DMESG-FAIL
igt@pm_rpm@modeset-stress-extra-wait:
shard-kbl: PASS -> DMESG-WARN
==== Warnings ====
igt@gem_exec_schedule@deep-bsd1:
shard-kbl: PASS -> SKIP
igt@gem_exec_schedule@deep-bsd2:
shard-kbl: SKIP -> PASS +2== Known issues ==
Here are the changes found in Patchwork_9409_full that come from known issues:
=== IGT changes ===
==== Issues hit ====
igt@drv_selftest@live_hangcheck:
shard-apl: PASS -> DMESG-FAIL (fdo#106947, fdo#106560)
igt@kms_cursor_crc@cursor-64x64-onscreen:
shard-glk: PASS -> INCOMPLETE (k.org#198133, fdo#103359)
igt@kms_flip@dpms-vs-vblank-race-interruptible:
shard-hsw: PASS -> FAIL (fdo#103060)
igt@kms_flip@flip-vs-expired-vblank:
shard-hsw: PASS -> FAIL (fdo#102887, fdo#105363)
igt@kms_flip_tiling@flip-to-y-tiled:
shard-glk: PASS -> FAIL (fdo#104724)
igt@perf_pmu@busy-check-all-vcs1:
shard-snb: SKIP -> INCOMPLETE (fdo#105411)
==== Possible fixes ====
igt@drv_selftest@live_hangcheck:
shard-kbl: DMESG-FAIL (fdo#106947, fdo#106560) -> PASS
igt@kms_flip@2x-plain-flip-fb-recreate:
shard-hsw: FAIL (fdo#100368) -> PASS
igt@kms_flip@flip-vs-expired-vblank:
shard-apl: FAIL (fdo#102887, fdo#105363) -> PASS
igt@kms_flip@plain-flip-fb-recreate:
shard-glk: FAIL (fdo#100368) -> PASS
igt@kms_flip_tiling@flip-y-tiled:
shard-glk: FAIL (fdo#103822, fdo#104724) -> PASS fdo#100368 https://bugs.freedesktop.org/show_bug.cgi?id=100368
fdo#102887 https://bugs.freedesktop.org/show_bug.cgi?id=102887
fdo#103060 https://bugs.freedesktop.org/show_bug.cgi?id=103060
fdo#103359 https://bugs.freedesktop.org/show_bug.cgi?id=103359
fdo#103822 https://bugs.freedesktop.org/show_bug.cgi?id=103822
fdo#104724 https://bugs.freedesktop.org/show_bug.cgi?id=104724
fdo#105363 https://bugs.freedesktop.org/show_bug.cgi?id=105363
fdo#105411 https://bugs.freedesktop.org/show_bug.cgi?id=105411
fdo#106560 https://bugs.freedesktop.org/show_bug.cgi?id=106560
fdo#106947 https://bugs.freedesktop.org/show_bug.cgi?id=106947
k.org#198133 https://bugzilla.kernel.org/show_bug.cgi?id=198133
== Participating hosts (5 -> 5) ==
No changes in participating hosts
== Build changes ==
* Linux: CI_DRM_4372 -> Patchwork_9409
CI_DRM_4372: d4ce215cacf172e6b8f1424d3750ea116c3c4abe @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_4529: 23d50a49413aff619d00ec50fc2e051e9b45baa5 @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_9409: fb8a552362c004a39371cdd0487f8c45c728341d @ git://anongit.freedesktop.org/gfx-ci/linux
piglit_4509: fdc5a4ca11124ab8413c7988896eec4c97336694 @ git://anongit.freedesktop.org/piglit
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_9409/shards.html
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx