* [PATCH] drm/i915: Use crtc_state->has_psr instead of CAN_PSR for pipe update
@ 2018-07-06 21:13 Tarun Vyas
2018-07-06 21:26 ` Rodrigo Vivi
` (3 more replies)
0 siblings, 4 replies; 5+ messages in thread
From: Tarun Vyas @ 2018-07-06 21:13 UTC (permalink / raw)
To: intel-gfx; +Cc: dhinakaran.pandiyan, rodrigo.vivi
In commit "drm/i915: Wait for PSR exit before checking for vblank
evasion", the idea was to limit the PSR IDLE checks when PSR is
actually supported. While CAN_PSR does do that check, it doesn't
applies on a per-crtc basis. crtc_state->has_psr is a more granular
check that avoids everything but pipe A, for the PSR IDLE check.
With this, the PSR IDLE check should be a *no-op* for all but pipe A
which is what was intended originally.
Fixes: a608987970b9 ("drm/i915: Wait for PSR exit before checking for
vblank evasion")
Signed-off-by: Tarun Vyas <tarun.vyas@intel.com>
---
drivers/gpu/drm/i915/intel_sprite.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/i915/intel_sprite.c b/drivers/gpu/drm/i915/intel_sprite.c
index 4990d6e84ddf..c27720847672 100644
--- a/drivers/gpu/drm/i915/intel_sprite.c
+++ b/drivers/gpu/drm/i915/intel_sprite.c
@@ -118,7 +118,7 @@ void intel_pipe_update_start(const struct intel_crtc_state *new_crtc_state)
* 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))
+ if ((new_crtc_state->has_psr) && intel_psr_wait_for_idle(dev_priv))
DRM_ERROR("PSR idle timed out, atomic update may fail\n");
local_irq_disable();
--
2.13.5
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply related [flat|nested] 5+ messages in thread* Re: [PATCH] drm/i915: Use crtc_state->has_psr instead of CAN_PSR for pipe update
2018-07-06 21:13 [PATCH] drm/i915: Use crtc_state->has_psr instead of CAN_PSR for pipe update Tarun Vyas
@ 2018-07-06 21:26 ` Rodrigo Vivi
2018-07-06 22:54 ` ✗ Fi.CI.CHECKPATCH: warning for " Patchwork
` (2 subsequent siblings)
3 siblings, 0 replies; 5+ messages in thread
From: Rodrigo Vivi @ 2018-07-06 21:26 UTC (permalink / raw)
To: Tarun Vyas; +Cc: intel-gfx, dhinakaran.pandiyan
On Fri, Jul 06, 2018 at 02:13:18PM -0700, Tarun Vyas wrote:
> In commit "drm/i915: Wait for PSR exit before checking for vblank
> evasion", the idea was to limit the PSR IDLE checks when PSR is
> actually supported. While CAN_PSR does do that check, it doesn't
> applies on a per-crtc basis. crtc_state->has_psr is a more granular
> check that avoids everything but pipe A, for the PSR IDLE check.
>
> With this, the PSR IDLE check should be a *no-op* for all but pipe A
> which is what was intended originally.
>
> Fixes: a608987970b9 ("drm/i915: Wait for PSR exit before checking for
> vblank evasion")
>
> Signed-off-by: Tarun Vyas <tarun.vyas@intel.com>
Reviewed-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
> ---
> drivers/gpu/drm/i915/intel_sprite.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/gpu/drm/i915/intel_sprite.c b/drivers/gpu/drm/i915/intel_sprite.c
> index 4990d6e84ddf..c27720847672 100644
> --- a/drivers/gpu/drm/i915/intel_sprite.c
> +++ b/drivers/gpu/drm/i915/intel_sprite.c
> @@ -118,7 +118,7 @@ void intel_pipe_update_start(const struct intel_crtc_state *new_crtc_state)
> * 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))
> + if ((new_crtc_state->has_psr) && intel_psr_wait_for_idle(dev_priv))
> DRM_ERROR("PSR idle timed out, atomic update may fail\n");
>
> local_irq_disable();
> --
> 2.13.5
>
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/intel-gfx
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 5+ messages in thread* ✗ Fi.CI.CHECKPATCH: warning for drm/i915: Use crtc_state->has_psr instead of CAN_PSR for pipe update
2018-07-06 21:13 [PATCH] drm/i915: Use crtc_state->has_psr instead of CAN_PSR for pipe update Tarun Vyas
2018-07-06 21:26 ` Rodrigo Vivi
@ 2018-07-06 22:54 ` Patchwork
2018-07-06 23:09 ` ✓ Fi.CI.BAT: success " Patchwork
2018-07-08 3:24 ` ✗ Fi.CI.IGT: failure " Patchwork
3 siblings, 0 replies; 5+ messages in thread
From: Patchwork @ 2018-07-06 22:54 UTC (permalink / raw)
To: Tarun Vyas; +Cc: intel-gfx
== Series Details ==
Series: drm/i915: Use crtc_state->has_psr instead of CAN_PSR for pipe update
URL : https://patchwork.freedesktop.org/series/46104/
State : warning
== Summary ==
$ dim checkpatch origin/drm-tip
27f7762e393d drm/i915: Use crtc_state->has_psr instead of CAN_PSR for pipe update
-:31: CHECK:UNNECESSARY_PARENTHESES: Unnecessary parentheses around 'new_crtc_state->has_psr'
#31: FILE: drivers/gpu/drm/i915/intel_sprite.c:121:
+ if ((new_crtc_state->has_psr) && intel_psr_wait_for_idle(dev_priv))
total: 0 errors, 0 warnings, 1 checks, 8 lines checked
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 5+ messages in thread
* ✓ Fi.CI.BAT: success for drm/i915: Use crtc_state->has_psr instead of CAN_PSR for pipe update
2018-07-06 21:13 [PATCH] drm/i915: Use crtc_state->has_psr instead of CAN_PSR for pipe update Tarun Vyas
2018-07-06 21:26 ` Rodrigo Vivi
2018-07-06 22:54 ` ✗ Fi.CI.CHECKPATCH: warning for " Patchwork
@ 2018-07-06 23:09 ` Patchwork
2018-07-08 3:24 ` ✗ Fi.CI.IGT: failure " Patchwork
3 siblings, 0 replies; 5+ messages in thread
From: Patchwork @ 2018-07-06 23:09 UTC (permalink / raw)
To: Tarun Vyas; +Cc: intel-gfx
== Series Details ==
Series: drm/i915: Use crtc_state->has_psr instead of CAN_PSR for pipe update
URL : https://patchwork.freedesktop.org/series/46104/
State : success
== Summary ==
= CI Bug Log - changes from CI_DRM_4449 -> Patchwork_9580 =
== Summary - SUCCESS ==
No regressions found.
External URL: https://patchwork.freedesktop.org/api/1.0/series/46104/revisions/1/mbox/
== Known issues ==
Here are the changes found in Patchwork_9580 that come from known issues:
=== IGT changes ===
==== Possible fixes ====
igt@kms_flip@basic-flip-vs-modeset:
fi-skl-6700hq: DMESG-WARN (fdo#105998) -> PASS +2
fdo#105998 https://bugs.freedesktop.org/show_bug.cgi?id=105998
== Participating hosts (46 -> 42) ==
Additional (1): fi-byt-j1900
Missing (5): fi-ctg-p8600 fi-ilk-m540 fi-byt-squawks fi-bsw-cyan fi-hsw-4200u
== Build changes ==
* Linux: CI_DRM_4449 -> Patchwork_9580
CI_DRM_4449: e470d2ee915b7c36d73d16da953cca8969d73906 @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_4543: 366eed37c7c71217e1cb1f3be5e26358a41f0001 @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_9580: 27f7762e393dff489b66b9a470107ed65db24e48 @ git://anongit.freedesktop.org/gfx-ci/linux
== Linux commits ==
27f7762e393d drm/i915: Use crtc_state->has_psr instead of CAN_PSR for pipe update
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_9580/issues.html
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 5+ messages in thread* ✗ Fi.CI.IGT: failure for drm/i915: Use crtc_state->has_psr instead of CAN_PSR for pipe update
2018-07-06 21:13 [PATCH] drm/i915: Use crtc_state->has_psr instead of CAN_PSR for pipe update Tarun Vyas
` (2 preceding siblings ...)
2018-07-06 23:09 ` ✓ Fi.CI.BAT: success " Patchwork
@ 2018-07-08 3:24 ` Patchwork
3 siblings, 0 replies; 5+ messages in thread
From: Patchwork @ 2018-07-08 3:24 UTC (permalink / raw)
To: Tarun Vyas; +Cc: intel-gfx
== Series Details ==
Series: drm/i915: Use crtc_state->has_psr instead of CAN_PSR for pipe update
URL : https://patchwork.freedesktop.org/series/46104/
State : failure
== Summary ==
= CI Bug Log - changes from CI_DRM_4449_full -> Patchwork_9580_full =
== Summary - FAILURE ==
Serious unknown changes coming with Patchwork_9580_full absolutely need to be
verified manually.
If you think the reported changes have nothing to do with the changes
introduced in Patchwork_9580_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_9580_full:
=== IGT changes ===
==== Possible regressions ====
igt@kms_flip_tiling@flip-x-tiled:
shard-glk: PASS -> FAIL
igt@kms_universal_plane@cursor-fb-leak-pipe-c:
shard-apl: PASS -> FAIL
==== Warnings ====
igt@gem_exec_schedule@deep-bsd2:
shard-kbl: PASS -> SKIP +2
igt@perf_pmu@rc6:
shard-kbl: SKIP -> PASS
== Known issues ==
Here are the changes found in Patchwork_9580_full that come from known issues:
=== IGT changes ===
==== Issues hit ====
igt@kms_busy@extended-pageflip-hang-oldfb-render-a:
shard-snb: PASS -> INCOMPLETE (fdo#105411)
igt@kms_cursor_legacy@2x-nonblocking-modeset-vs-cursor-atomic:
shard-glk: PASS -> FAIL (fdo#105454, fdo#106509)
igt@kms_flip@2x-plain-flip-ts-check-interruptible:
shard-glk: PASS -> FAIL (fdo#100368)
igt@kms_setmode@basic:
shard-apl: PASS -> FAIL (fdo#99912)
==== Possible fixes ====
igt@kms_cursor_legacy@2x-long-nonblocking-modeset-vs-cursor-atomic:
shard-glk: FAIL (fdo#106509) -> PASS
igt@kms_flip@2x-plain-flip-fb-recreate:
shard-glk: FAIL (fdo#100368) -> PASS
igt@kms_flip_tiling@flip-to-y-tiled:
shard-glk: FAIL -> PASS
igt@kms_setmode@basic:
shard-kbl: FAIL (fdo#99912) -> PASS
fdo#100368 https://bugs.freedesktop.org/show_bug.cgi?id=100368
fdo#105411 https://bugs.freedesktop.org/show_bug.cgi?id=105411
fdo#105454 https://bugs.freedesktop.org/show_bug.cgi?id=105454
fdo#106509 https://bugs.freedesktop.org/show_bug.cgi?id=106509
fdo#99912 https://bugs.freedesktop.org/show_bug.cgi?id=99912
== Participating hosts (5 -> 5) ==
No changes in participating hosts
== Build changes ==
* Linux: CI_DRM_4449 -> Patchwork_9580
CI_DRM_4449: e470d2ee915b7c36d73d16da953cca8969d73906 @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_4543: 366eed37c7c71217e1cb1f3be5e26358a41f0001 @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_9580: 27f7762e393dff489b66b9a470107ed65db24e48 @ 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_9580/shards.html
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2018-07-08 3:24 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-07-06 21:13 [PATCH] drm/i915: Use crtc_state->has_psr instead of CAN_PSR for pipe update Tarun Vyas
2018-07-06 21:26 ` Rodrigo Vivi
2018-07-06 22:54 ` ✗ Fi.CI.CHECKPATCH: warning for " Patchwork
2018-07-06 23:09 ` ✓ Fi.CI.BAT: success " Patchwork
2018-07-08 3:24 ` ✗ Fi.CI.IGT: failure " Patchwork
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).