| Message ID | 20220406210540.493610-1-jose.souza@intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | drm/i915/display: Fix warnings about PSR lock not held | expand |
On Wed, 2022-04-06 at 14:05 -0700, José Roberto de Souza wrote: > Commit 3b6f409547fb ("drm/i915/display/psr: Lock and unlock PSR > around > pipe updates") did not took into account async flips with PSR1 and > PSR2 HW tracking, causing PSR lock not be held and causing warnings > when intel_psr2_program_trans_man_trk_ctl() is executed. > > So here taking the PSR lock before the earlier return in > intel_pipe_update_start/end(). Reviewed-by: Jouni Högander <jouni.hogander@intel.com> > > Cc: Jouni Högander <jouni.hogander@intel.com> > Reported-by: Imre Deak <imre.deak@intel.com> > Fixes: 3b6f409547fb ("drm/i915/display/psr: Lock and unlock PSR > around pipe updates") > Signed-off-by: José Roberto de Souza <jose.souza@intel.com> > --- > drivers/gpu/drm/i915/display/intel_crtc.c | 8 ++++---- > 1 file changed, 4 insertions(+), 4 deletions(-) > > diff --git a/drivers/gpu/drm/i915/display/intel_crtc.c > b/drivers/gpu/drm/i915/display/intel_crtc.c > index a5439182d5ae4..4442aa355f868 100644 > --- a/drivers/gpu/drm/i915/display/intel_crtc.c > +++ b/drivers/gpu/drm/i915/display/intel_crtc.c > @@ -487,6 +487,8 @@ void intel_pipe_update_start(struct > intel_crtc_state *new_crtc_state) > intel_crtc_has_type(new_crtc_state, INTEL_OUTPUT_DSI); > DEFINE_WAIT(wait); > > + intel_psr_lock(new_crtc_state); > + > if (new_crtc_state->do_async_flip) > return; > > @@ -507,8 +509,6 @@ void intel_pipe_update_start(struct > intel_crtc_state *new_crtc_state) > VBLANK_EVASION_TI > ME_US); > max = vblank_start - 1; > > - intel_psr_lock(new_crtc_state); > - > if (min <= 0 || max <= 0) > goto irq_disable; > > @@ -634,6 +634,8 @@ void intel_pipe_update_end(struct > intel_crtc_state *new_crtc_state) > ktime_t end_vbl_time = ktime_get(); > struct drm_i915_private *dev_priv = to_i915(crtc->base.dev); > > + intel_psr_unlock(new_crtc_state); > + > if (new_crtc_state->do_async_flip) > return; > > @@ -685,8 +687,6 @@ void intel_pipe_update_end(struct > intel_crtc_state *new_crtc_state) > > local_irq_enable(); > > - intel_psr_unlock(new_crtc_state); > - > if (intel_vgpu_active(dev_priv)) > return; >
On Thu, 2022-04-07 at 21:01 +0000, Patchwork wrote:
Patch Details
Series: drm/i915/display: Fix warnings about PSR lock not held (rev3)
URL: https://patchwork.freedesktop.org/series/102298/
State: failure
Details: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22818/index.html
CI Bug Log - changes from CI_DRM_11472 -> Patchwork_22818
Summary
FAILURE
Serious unknown changes coming with Patchwork_22818 absolutely need to be
verified manually.
If you think the reported changes have nothing to do with the changes
introduced in Patchwork_22818, please notify your bug team to allow them
to document this new failure mode, which will reduce false positives in CI.
External URL: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22818/index.html
Participating hosts (48 -> 46)
Additional (4): bat-hsw-1 bat-rpls-2 fi-bwr-2160 bat-adlp-4
Missing (6): shard-tglu shard-rkl fi-bsw-cyan bat-rpls-1 fi-blb-e6850 fi-bdw-samus
Possible new issues
Here are the unknown changes that may have been introduced in Patchwork_22818:
CI changes
Possible regressions
* boot:
* fi-bwr-2160: NOTRUN -> FAIL<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22818/fi-bwr-2160/boot.html>
Hi Lakshmi
Can you please take a look at this?
There is other series with the same failure: https://patchwork.freedesktop.org/series/102333/
IGT changes
Possible regressions
* igt@gem_lmem_swapping@basic:
* bat-dg1-5: NOTRUN -> SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22818/bat-dg1-5/igt@gem_lmem_swapping@basic.html> +2 similar issues
* fi-cfl-8109u: NOTRUN -> FAIL<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22818/fi-cfl-8109u/igt@gem_lmem_swapping@basic.html>
Warnings
* igt@runner@aborted:
* fi-rkl-11600: FAIL<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11472/fi-rkl-11600/igt@runner@aborted.html> (i915#4312<https://gitlab.freedesktop.org/drm/intel/issues/4312>) -> FAIL<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22818/fi-rkl-11600/igt@runner@aborted.html>
* fi-kbl-guc: FAIL<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11472/fi-kbl-guc/igt@runner@aborted.html> (i915#4312<https://gitlab.freedesktop.org/drm/intel/issues/4312> / i915#5257<https://gitlab.freedesktop.org/drm/intel/issues/5257>) -> FAIL<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22818/fi-kbl-guc/igt@runner@aborted.html>
Suppressed
The following results come from untrusted machines, tests, or statuses.
They do not affect the overall result.
* igt@runner@aborted:
* {bat-hsw-1}: NOTRUN -> FAIL<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22818/bat-hsw-1/igt@runner@aborted.html>
Known issues
Here are the changes found in Patchwork_22818 that come from known issues:
IGT changes
Issues hit
* igt@core_auth@basic-auth:
* fi-kbl-8809g: NOTRUN -> SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22818/fi-kbl-8809g/igt@core_auth@basic-auth.html> (fdo#109271<https://bugs.freedesktop.org/show_bug.cgi?id=109271>) +1 similar issue
* igt@fbdev@eof:
* fi-kbl-8809g: NOTRUN -> INCOMPLETE<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22818/fi-kbl-8809g/igt@fbdev@eof.html> (i915#5557<https://gitlab.freedesktop.org/drm/intel/issues/5557>)
* igt@fbdev@write:
* bat-dg1-5: NOTRUN -> SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22818/bat-dg1-5/igt@fbdev@write.html> (i915#2582<https://gitlab.freedesktop.org/drm/intel/issues/2582>) +4 similar issues
* igt@gem_close_race@basic-process:
* fi-ivb-3770: NOTRUN -> SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22818/fi-ivb-3770/igt@gem_close_race@basic-process.html> (fdo#109271<https://bugs.freedesktop.org/show_bug.cgi?id=109271>) +146 similar issues
* igt@kms_flip@basic-flip-vs-dpms:
* fi-kbl-soraka: NOTRUN -> SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22818/fi-kbl-soraka/igt@kms_flip@basic-flip-vs-dpms.html> (fdo#109271<https://bugs.freedesktop.org/show_bug.cgi?id=109271>) +146 similar issues
* igt@kms_pipe_crc_basic@compare-crc-sanitycheck-pipe-b:
* fi-cfl-8109u: NOTRUN -> SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22818/fi-cfl-8109u/igt@kms_pipe_crc_basic@compare-crc-sanitycheck-pipe-b.html> (fdo#109271<https://bugs.freedesktop.org/show_bug.cgi?id=109271>) +145 similar issues
* igt@kms_pipe_crc_basic@compare-crc-sanitycheck-pipe-c:
* bat-dg1-5: NOTRUN -> SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22818/bat-dg1-5/igt@kms_pipe_crc_basic@compare-crc-sanitycheck-pipe-c.html> (i915#2575<https://gitlab.freedesktop.org/drm/intel/issues/2575> / i915#5341<https://gitlab.freedesktop.org/drm/intel/issues/5341>)
* fi-cfl-8109u: NOTRUN -> SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22818/fi-cfl-8109u/igt@kms_pipe_crc_basic@compare-crc-sanitycheck-pipe-c.html> (fdo#109271<https://bugs.freedesktop.org/show_bug.cgi?id=109271> / i915#5341<https://gitlab.freedesktop.org/drm/intel/issues/5341>)
* fi-kbl-soraka: NOTRUN -> SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22818/fi-kbl-soraka/igt@kms_pipe_crc_basic@compare-crc-sanitycheck-pipe-c.html> (fdo#109271<https://bugs.freedesktop.org/show_bug.cgi?id=109271> / i915#5341<https://gitlab.freedesktop.org/drm/intel/issues/5341>)
* fi-ivb-3770: NOTRUN -> SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22818/fi-ivb-3770/igt@kms_pipe_crc_basic@compare-crc-sanitycheck-pipe-c.html> (fdo#109271<https://bugs.freedesktop.org/show_bug.cgi?id=109271> / i915#5341<https://gitlab.freedesktop.org/drm/intel/issues/5341>)
* igt@prime_self_import@basic-with_two_bos:
* bat-dg1-5: NOTRUN -> SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22818/bat-dg1-5/igt@prime_self_import@basic-with_two_bos.html> (i915#2575<https://gitlab.freedesktop.org/drm/intel/issues/2575>) +143 similar issues
* igt@runner@aborted:
* bat-adlp-4: NOTRUN -> FAIL<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22818/bat-adlp-4/igt@runner@aborted.html> (i915#5457<https://gitlab.freedesktop.org/drm/intel/issues/5457>)
Warnings
* igt@gem_lmem_swapping@basic:
* fi-glk-j4005: FAIL<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11472/fi-glk-j4005/igt@gem_lmem_swapping@basic.html> -> SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22818/fi-glk-j4005/igt@gem_lmem_swapping@basic.html> (fdo#109271<https://bugs.freedesktop.org/show_bug.cgi?id=109271>)
* igt@runner@aborted:
* fi-cfl-8109u: FAIL<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11472/fi-cfl-8109u/igt@runner@aborted.html> -> FAIL<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22818/fi-cfl-8109u/igt@runner@aborted.html> (i915#4312<https://gitlab.freedesktop.org/drm/intel/issues/4312>)
* bat-dg1-5: FAIL<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11472/bat-dg1-5/igt@runner@aborted.html> -> FAIL<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22818/bat-dg1-5/igt@runner@aborted.html> (i915#4312<https://gitlab.freedesktop.org/drm/intel/issues/4312>)
* fi-kbl-8809g: FAIL<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11472/fi-kbl-8809g/igt@runner@aborted.html> -> FAIL<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22818/fi-kbl-8809g/igt@runner@aborted.html> (i915#2722<https://gitlab.freedesktop.org/drm/intel/issues/2722>)
* fi-kbl-soraka: FAIL<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11472/fi-kbl-soraka/igt@runner@aborted.html> -> FAIL<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22818/fi-kbl-soraka/igt@runner@aborted.html> (i915#4312<https://gitlab.freedesktop.org/drm/intel/issues/4312>)
* fi-hsw-4770: FAIL<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11472/fi-hsw-4770/igt@runner@aborted.html> (i915#4312<https://gitlab.freedesktop.org/drm/intel/issues/4312>) -> FAIL<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22818/fi-hsw-4770/igt@runner@aborted.html> (i915#4312<https://gitlab.freedesktop.org/drm/intel/issues/4312> / i915#5594<https://gitlab.freedesktop.org/drm/intel/issues/5594>)
* fi-ivb-3770: FAIL<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11472/fi-ivb-3770/igt@runner@aborted.html> -> FAIL<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22818/fi-ivb-3770/igt@runner@aborted.html> (i915#4312<https://gitlab.freedesktop.org/drm/intel/issues/4312>)
* fi-tgl-1115g4: FAIL<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11472/fi-tgl-1115g4/igt@runner@aborted.html> (i915#4312<https://gitlab.freedesktop.org/drm/intel/issues/4312> / i915#5257<https://gitlab.freedesktop.org/drm/intel/issues/5257>) -> FAIL<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22818/fi-tgl-1115g4/igt@runner@aborted.html> (i915#3690<https://gitlab.freedesktop.org/drm/intel/issues/3690> / i915#4312<https://gitlab.freedesktop.org/drm/intel/issues/4312>)
* fi-bsw-n3050: FAIL<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11472/fi-bsw-n3050/igt@runner@aborted.html> (i915#4312<https://gitlab.freedesktop.org/drm/intel/issues/4312>) -> FAIL<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22818/fi-bsw-n3050/igt@runner@aborted.html> (i915#3690<https://gitlab.freedesktop.org/drm/intel/issues/3690> / i915#4312<https://gitlab.freedesktop.org/drm/intel/issues/4312>)
{name}: This element is suppressed. This means it is ignored when computing
the status of the difference (SUCCESS, WARNING, or FAILURE).
Build changes
* Linux: CI_DRM_11472 -> Patchwork_22818
CI-20190529: 20190529
CI_DRM_11472: 85882df13168c5f46b41401b96975de857e3ccac @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_6415: c3b690bd5f7fb1fb7ed786ab0f3b815930a6a55f @ https://gitlab.freedesktop.org/drm/igt-gpu-tools.git
Patchwork_22818: 94b0c7a7c959ef072e258af592a337650314f108 @ git://anongit.freedesktop.org/gfx-ci/linux
== Linux commits ==
94b0c7a7c959 drm/i915/display: Fix warnings about PSR lock not held
Issue is related to
https://gitlab.freedesktop.org/drm/intel/-/issues/5602
All tests - *ERROR* Scratch setup failed, DEBUG_LOCKS_WARN_ON(lock->magic != lock)
Lakshmi.
From: Souza, Jose <jose.souza@intel.com>
Sent: Thursday, April 7, 2022 2:05 PM
To: intel-gfx@lists.freedesktop.org; Vudum, Lakshminarayana <lakshminarayana.vudum@intel.com>
Subject: Re: ✗ Fi.CI.BAT: failure for drm/i915/display: Fix warnings about PSR lock not held (rev3)
On Thu, 2022-04-07 at 21:01 +0000, Patchwork wrote:
Patch Details
Series:
drm/i915/display: Fix warnings about PSR lock not held (rev3)
URL:
https://patchwork.freedesktop.org/series/102298/
State:
failure
Details:
https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22818/index.html
CI Bug Log - changes from CI_DRM_11472 -> Patchwork_22818
Summary
FAILURE
Serious unknown changes coming with Patchwork_22818 absolutely need to be
verified manually.
If you think the reported changes have nothing to do with the changes
introduced in Patchwork_22818, please notify your bug team to allow them
to document this new failure mode, which will reduce false positives in CI.
External URL: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22818/index.html
Participating hosts (48 -> 46)
Additional (4): bat-hsw-1 bat-rpls-2 fi-bwr-2160 bat-adlp-4
Missing (6): shard-tglu shard-rkl fi-bsw-cyan bat-rpls-1 fi-blb-e6850 fi-bdw-samus
Possible new issues
Here are the unknown changes that may have been introduced in Patchwork_22818:
CI changes
Possible regressions
* boot:
* fi-bwr-2160: NOTRUN -> FAIL<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22818/fi-bwr-2160/boot.html>
Hi Lakshmi
Can you please take a look at this?
There is other series with the same failure: https://patchwork.freedesktop.org/series/102333/
IGT changes
Possible regressions
* igt@gem_lmem_swapping@basic:
* bat-dg1-5: NOTRUN -> SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22818/bat-dg1-5/igt@gem_lmem_swapping@basic.html> +2 similar issues
* fi-cfl-8109u: NOTRUN -> FAIL<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22818/fi-cfl-8109u/igt@gem_lmem_swapping@basic.html>
Warnings
* igt@runner@aborted:
* fi-rkl-11600: FAIL<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11472/fi-rkl-11600/igt@runner@aborted.html> (i915#4312<https://gitlab.freedesktop.org/drm/intel/issues/4312>) -> FAIL<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22818/fi-rkl-11600/igt@runner@aborted.html>
* fi-kbl-guc: FAIL<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11472/fi-kbl-guc/igt@runner@aborted.html> (i915#4312<https://gitlab.freedesktop.org/drm/intel/issues/4312> / i915#5257<https://gitlab.freedesktop.org/drm/intel/issues/5257>) -> FAIL<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22818/fi-kbl-guc/igt@runner@aborted.html>
Suppressed
The following results come from untrusted machines, tests, or statuses.
They do not affect the overall result.
* igt@runner@aborted:
* {bat-hsw-1}: NOTRUN -> FAIL<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22818/bat-hsw-1/igt@runner@aborted.html>
Known issues
Here are the changes found in Patchwork_22818 that come from known issues:
IGT changes
Issues hit
* igt@core_auth@basic-auth:
* fi-kbl-8809g: NOTRUN -> SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22818/fi-kbl-8809g/igt@core_auth@basic-auth.html> (fdo#109271<https://bugs.freedesktop.org/show_bug.cgi?id=109271>) +1 similar issue
* igt@fbdev@eof:
* fi-kbl-8809g: NOTRUN -> INCOMPLETE<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22818/fi-kbl-8809g/igt@fbdev@eof.html> (i915#5557<https://gitlab.freedesktop.org/drm/intel/issues/5557>)
* igt@fbdev@write:
* bat-dg1-5: NOTRUN -> SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22818/bat-dg1-5/igt@fbdev@write.html> (i915#2582<https://gitlab.freedesktop.org/drm/intel/issues/2582>) +4 similar issues
* igt@gem_close_race@basic-process:
* fi-ivb-3770: NOTRUN -> SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22818/fi-ivb-3770/igt@gem_close_race@basic-process.html> (fdo#109271<https://bugs.freedesktop.org/show_bug.cgi?id=109271>) +146 similar issues
* igt@kms_flip@basic-flip-vs-dpms:
* fi-kbl-soraka: NOTRUN -> SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22818/fi-kbl-soraka/igt@kms_flip@basic-flip-vs-dpms.html> (fdo#109271<https://bugs.freedesktop.org/show_bug.cgi?id=109271>) +146 similar issues
* igt@kms_pipe_crc_basic@compare-crc-sanitycheck-pipe-b:
* fi-cfl-8109u: NOTRUN -> SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22818/fi-cfl-8109u/igt@kms_pipe_crc_basic@compare-crc-sanitycheck-pipe-b.html> (fdo#109271<https://bugs.freedesktop.org/show_bug.cgi?id=109271>) +145 similar issues
* igt@kms_pipe_crc_basic@compare-crc-sanitycheck-pipe-c:
* bat-dg1-5: NOTRUN -> SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22818/bat-dg1-5/igt@kms_pipe_crc_basic@compare-crc-sanitycheck-pipe-c.html> (i915#2575<https://gitlab.freedesktop.org/drm/intel/issues/2575> / i915#5341<https://gitlab.freedesktop.org/drm/intel/issues/5341>)
* fi-cfl-8109u: NOTRUN -> SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22818/fi-cfl-8109u/igt@kms_pipe_crc_basic@compare-crc-sanitycheck-pipe-c.html> (fdo#109271<https://bugs.freedesktop.org/show_bug.cgi?id=109271> / i915#5341<https://gitlab.freedesktop.org/drm/intel/issues/5341>)
* fi-kbl-soraka: NOTRUN -> SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22818/fi-kbl-soraka/igt@kms_pipe_crc_basic@compare-crc-sanitycheck-pipe-c.html> (fdo#109271<https://bugs.freedesktop.org/show_bug.cgi?id=109271> / i915#5341<https://gitlab.freedesktop.org/drm/intel/issues/5341>)
* fi-ivb-3770: NOTRUN -> SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22818/fi-ivb-3770/igt@kms_pipe_crc_basic@compare-crc-sanitycheck-pipe-c.html> (fdo#109271<https://bugs.freedesktop.org/show_bug.cgi?id=109271> / i915#5341<https://gitlab.freedesktop.org/drm/intel/issues/5341>)
* igt@prime_self_import@basic-with_two_bos:
* bat-dg1-5: NOTRUN -> SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22818/bat-dg1-5/igt@prime_self_import@basic-with_two_bos.html> (i915#2575<https://gitlab.freedesktop.org/drm/intel/issues/2575>) +143 similar issues
* igt@runner@aborted:
* bat-adlp-4: NOTRUN -> FAIL<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22818/bat-adlp-4/igt@runner@aborted.html> (i915#5457<https://gitlab.freedesktop.org/drm/intel/issues/5457>)
Warnings
* igt@gem_lmem_swapping@basic:
* fi-glk-j4005: FAIL<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11472/fi-glk-j4005/igt@gem_lmem_swapping@basic.html> -> SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22818/fi-glk-j4005/igt@gem_lmem_swapping@basic.html> (fdo#109271<https://bugs.freedesktop.org/show_bug.cgi?id=109271>)
* igt@runner@aborted:
* fi-cfl-8109u: FAIL<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11472/fi-cfl-8109u/igt@runner@aborted.html> -> FAIL<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22818/fi-cfl-8109u/igt@runner@aborted.html> (i915#4312<https://gitlab.freedesktop.org/drm/intel/issues/4312>)
* bat-dg1-5: FAIL<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11472/bat-dg1-5/igt@runner@aborted.html> -> FAIL<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22818/bat-dg1-5/igt@runner@aborted.html> (i915#4312<https://gitlab.freedesktop.org/drm/intel/issues/4312>)
* fi-kbl-8809g: FAIL<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11472/fi-kbl-8809g/igt@runner@aborted.html> -> FAIL<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22818/fi-kbl-8809g/igt@runner@aborted.html> (i915#2722<https://gitlab.freedesktop.org/drm/intel/issues/2722>)
* fi-kbl-soraka: FAIL<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11472/fi-kbl-soraka/igt@runner@aborted.html> -> FAIL<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22818/fi-kbl-soraka/igt@runner@aborted.html> (i915#4312<https://gitlab.freedesktop.org/drm/intel/issues/4312>)
* fi-hsw-4770: FAIL<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11472/fi-hsw-4770/igt@runner@aborted.html> (i915#4312<https://gitlab.freedesktop.org/drm/intel/issues/4312>) -> FAIL<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22818/fi-hsw-4770/igt@runner@aborted.html> (i915#4312<https://gitlab.freedesktop.org/drm/intel/issues/4312> / i915#5594<https://gitlab.freedesktop.org/drm/intel/issues/5594>)
* fi-ivb-3770: FAIL<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11472/fi-ivb-3770/igt@runner@aborted.html> -> FAIL<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22818/fi-ivb-3770/igt@runner@aborted.html> (i915#4312<https://gitlab.freedesktop.org/drm/intel/issues/4312>)
* fi-tgl-1115g4: FAIL<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11472/fi-tgl-1115g4/igt@runner@aborted.html> (i915#4312<https://gitlab.freedesktop.org/drm/intel/issues/4312> / i915#5257<https://gitlab.freedesktop.org/drm/intel/issues/5257>) -> FAIL<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22818/fi-tgl-1115g4/igt@runner@aborted.html> (i915#3690<https://gitlab.freedesktop.org/drm/intel/issues/3690> / i915#4312<https://gitlab.freedesktop.org/drm/intel/issues/4312>)
* fi-bsw-n3050: FAIL<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11472/fi-bsw-n3050/igt@runner@aborted.html> (i915#4312<https://gitlab.freedesktop.org/drm/intel/issues/4312>) -> FAIL<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22818/fi-bsw-n3050/igt@runner@aborted.html> (i915#3690<https://gitlab.freedesktop.org/drm/intel/issues/3690> / i915#4312<https://gitlab.freedesktop.org/drm/intel/issues/4312>)
{name}: This element is suppressed. This means it is ignored when computing
the status of the difference (SUCCESS, WARNING, or FAILURE).
Build changes
* Linux: CI_DRM_11472 -> Patchwork_22818
CI-20190529: 20190529
CI_DRM_11472: 85882df13168c5f46b41401b96975de857e3ccac @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_6415: c3b690bd5f7fb1fb7ed786ab0f3b815930a6a55f @ https://gitlab.freedesktop.org/drm/igt-gpu-tools.git
Patchwork_22818: 94b0c7a7c959ef072e258af592a337650314f108 @ git://anongit.freedesktop.org/gfx-ci/linux
== Linux commits ==
94b0c7a7c959 drm/i915/display: Fix warnings about PSR lock not held
diff --git a/drivers/gpu/drm/i915/display/intel_crtc.c b/drivers/gpu/drm/i915/display/intel_crtc.c index a5439182d5ae4..4442aa355f868 100644 --- a/drivers/gpu/drm/i915/display/intel_crtc.c +++ b/drivers/gpu/drm/i915/display/intel_crtc.c @@ -487,6 +487,8 @@ void intel_pipe_update_start(struct intel_crtc_state *new_crtc_state) intel_crtc_has_type(new_crtc_state, INTEL_OUTPUT_DSI); DEFINE_WAIT(wait); + intel_psr_lock(new_crtc_state); + if (new_crtc_state->do_async_flip) return; @@ -507,8 +509,6 @@ void intel_pipe_update_start(struct intel_crtc_state *new_crtc_state) VBLANK_EVASION_TIME_US); max = vblank_start - 1; - intel_psr_lock(new_crtc_state); - if (min <= 0 || max <= 0) goto irq_disable; @@ -634,6 +634,8 @@ void intel_pipe_update_end(struct intel_crtc_state *new_crtc_state) ktime_t end_vbl_time = ktime_get(); struct drm_i915_private *dev_priv = to_i915(crtc->base.dev); + intel_psr_unlock(new_crtc_state); + if (new_crtc_state->do_async_flip) return; @@ -685,8 +687,6 @@ void intel_pipe_update_end(struct intel_crtc_state *new_crtc_state) local_irq_enable(); - intel_psr_unlock(new_crtc_state); - if (intel_vgpu_active(dev_priv)) return;
Commit 3b6f409547fb ("drm/i915/display/psr: Lock and unlock PSR around pipe updates") did not took into account async flips with PSR1 and PSR2 HW tracking, causing PSR lock not be held and causing warnings when intel_psr2_program_trans_man_trk_ctl() is executed. So here taking the PSR lock before the earlier return in intel_pipe_update_start/end(). Cc: Jouni Högander <jouni.hogander@intel.com> Reported-by: Imre Deak <imre.deak@intel.com> Fixes: 3b6f409547fb ("drm/i915/display/psr: Lock and unlock PSR around pipe updates") Signed-off-by: José Roberto de Souza <jose.souza@intel.com> --- drivers/gpu/drm/i915/display/intel_crtc.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)