diff mbox series

[CI,1/3] drm/i915/display/psr: Set partial frame enable when forcing full frame fetch

Message ID 20220405155344.47219-1-jose.souza@intel.com (mailing list archive)
State New, archived
Headers show
Series [CI,1/3] drm/i915/display/psr: Set partial frame enable when forcing full frame fetch | expand

Commit Message

Souza, Jose April 5, 2022, 3:53 p.m. UTC
Following up what was done in commit 804f46885317 ("drm/i915/psr: Set
"SF Partial Frame Enable" also on full update") and also setting
partial frame enable when psr_force_hw_tracking_exit() is called.

Also as PSR2_MAN_TRK_CTL is a double buffered registers do a RMW
is not a good idea so here also setting the man_trk_ctl_enable_bit()
that is required in TGL and only doing a register write.

v2:
- not doing a rmw

v3:
- removing the inline from functions that return PSR2_MAN_TRK_CTL
bits

Reviewed-by: Jouni Högander <jouni.hogander@intel.com>
Cc: Jouni Högander <jouni.hogander@intel.com>
Cc: Mika Kahola <mika.kahola@intel.com>
Signed-off-by: José Roberto de Souza <jose.souza@intel.com>
---
 drivers/gpu/drm/i915/display/intel_psr.c | 22 +++++++++++++---------
 1 file changed, 13 insertions(+), 9 deletions(-)

Comments

Souza, Jose April 6, 2022, 3:45 p.m. UTC | #1
On Tue, 2022-04-05 at 21:50 +0000, Patchwork wrote:
Patch Details
Series: series starting with [CI,1/3] drm/i915/display/psr: Set partial frame enable when forcing full frame fetch
URL:    https://patchwork.freedesktop.org/series/102209/
State:  failure
Details:        https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22785/index.html
CI Bug Log - changes from CI_DRM_11456_full -> Patchwork_22785_full
Summary

FAILURE

Serious unknown changes coming with Patchwork_22785_full absolutely need to be
verified manually.

If you think the reported changes have nothing to do with the changes
introduced in Patchwork_22785_full, please notify your bug team to allow them
to document this new failure mode, which will reduce false positives in CI.

Participating hosts (13 -> 10)

Missing (3): shard-rkl shard-dg1 shard-tglu

Possible new issues

Here are the unknown changes that may have been introduced in Patchwork_22785_full:

IGT changes
Possible regressions

  *   igt@i915_pm_rpm@basic-pci-d3-state:
     *   shard-iclb: PASS<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11456/shard-iclb8/igt@i915_pm_rpm@basic-pci-d3-state.html> -> INCOMPLETE<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22785/shard-iclb4/igt@i915_pm_rpm@basic-pci-d3-state.html>

This series mostly affects TGL and ADL-P.
Defiantly notting related to PCI D3.

So pushing it, thanks for the reviews Jouni.

Piglit changes
Possible regressions

  *   object namespace pollution@framebuffer with glclear:
     *   pig-kbl-iris: NOTRUN -> INCOMPLETE<None>

Known issues

Here are the changes found in Patchwork_22785_full that come from known issues:

CI changes
Possible fixes

  *   boot:
     *   shard-skl: (PASS<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11456/shard-skl1/boot.html>, PASS<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11456/shard-skl9/boot.html>, PASS<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11456/shard-skl9/boot.html>, PASS<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11456/shard-skl8/boot.html>, PASS<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11456/shard-skl8/boot.html>, PASS<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11456/shard-skl7/boot.html>, PASS<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11456/shard-skl7/boot.html>, PASS<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11456/shard-skl6/boot.html>, PASS<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11456/shard-skl6/boot.html>, PASS<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11456/shard-skl5/boot.html>, PASS<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11456/shard-skl5/boot.html>, PASS<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11456/shard-skl4/boot.html>, PASS<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11456/shard-skl4/boot.html>, FAIL<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11456/shard-skl3/boot.html>, FAIL<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11456/shard-skl3/boot.html>, FAIL<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11456/shard-skl3/boot.html>, PASS<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11456/shard-skl10/boot.html>, PASS<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11456/shard-skl10/boot.html>, PASS<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11456/shard-skl1/boot.html>) ([i915#5032]) -> (PASS<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22785/shard-skl9/boot.html>, PASS<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22785/shard-skl9/boot.html>, PASS<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22785/shard-skl8/boot.html>, PASS<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22785/shard-skl8/boot.html>, PASS<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22785/shard-skl7/boot.html>, PASS<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22785/shard-skl7/boot.html>, PASS<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22785/shard-skl6/boot.html>, PASS<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22785/shard-skl6/boot.html>, PASS<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22785/shard-skl5/boot.html>, PASS<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22785/shard-skl5/boot.html>, PASS<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22785/shard-skl4/boot.html>, PASS<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22785/shard-skl4/boot.html>, PASS<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22785/shard-skl2/boot.html>, PASS<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22785/shard-skl2/boot.html>, PASS<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22785/shard-skl2/boot.html>, PASS<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22785/shard-skl1/boot.html>, PASS<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22785/shard-skl1/boot.html>, PASS<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22785/shard-skl10/boot.html>, PASS<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22785/shard-skl10/boot.html>)

IGT changes
Issues hit

  *   igt@gem_ccs@ctrl-surf-copy-new-ctx:

     *   shard-iclb: NOTRUN -> SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22785/shard-iclb5/igt@gem_ccs@ctrl-surf-copy-new-ctx.html> ([i915#5327])
  *   igt@gem_create@create-massive:

     *   shard-apl: NOTRUN -> DMESG-WARN<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22785/shard-apl1/igt@gem_create@create-massive.html> ([i915#4991])
  *   igt@gem_ctx_param@set-priority-not-supported:

     *   shard-iclb: NOTRUN -> SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22785/shard-iclb5/igt@gem_ctx_param@set-priority-not-supported.html> ([fdo#109314])
  *   igt@gem_eio@kms:

     *   shard-tglb: PASS<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11456/shard-tglb7/igt@gem_eio@kms.html> -> FAIL<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22785/shard-tglb1/igt@gem_eio@kms.html> ([i915#232])
  *   igt@gem_exec_balancer@parallel-out-fence:

     *   shard-iclb: NOTRUN -> SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22785/shard-iclb6/igt@gem_exec_balancer@parallel-out-fence.html> ([i915#4525]) +1 similar issue
  *   igt@gem_exec_fair@basic-deadline:

     *   shard-glk: PASS<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11456/shard-glk1/igt@gem_exec_fair@basic-deadline.html> -> FAIL<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22785/shard-glk9/igt@gem_exec_fair@basic-deadline.html> ([i915#2846])
  *   igt@gem_exec_fair@basic-none@vcs1:

     *   shard-iclb: NOTRUN -> FAIL<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22785/shard-iclb2/igt@gem_exec_fair@basic-none@vcs1.html> ([i915#2842])
  *   igt@gem_exec_fair@basic-none@vecs0:

     *   shard-apl: NOTRUN -> FAIL<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22785/shard-apl1/igt@gem_exec_fair@basic-none@vecs0.html> ([i915#2842])
  *   igt@gem_exec_fair@basic-pace@vcs1:

     *   shard-kbl: PASS<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11456/shard-kbl4/igt@gem_exec_fair@basic-pace@vcs1.html> -> FAIL<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22785/shard-kbl1/igt@gem_exec_fair@basic-pace@vcs1.html> ([i915#2842])
  *   igt@gem_exec_params@rsvd2-dirt:

     *   shard-iclb: NOTRUN -> SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22785/shard-iclb8/igt@gem_exec_params@rsvd2-dirt.html> ([fdo#109283])
  *   igt@gem_huc_copy@huc-copy:

     *   shard-tglb: PASS<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11456/shard-tglb2/igt@gem_huc_copy@huc-copy.html> -> SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22785/shard-tglb7/igt@gem_huc_copy@huc-copy.html> ([i915#2190])
  *   igt@gem_lmem_swapping@heavy-random:

     *   shard-iclb: NOTRUN -> SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22785/shard-iclb7/igt@gem_lmem_swapping@heavy-random.html> ([i915#4613]) +1 similar issue
  *   igt@gem_lmem_swapping@heavy-verify-multi:

     *   shard-skl: NOTRUN -> SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22785/shard-skl1/igt@gem_lmem_swapping@heavy-verify-multi.html> ([fdo#109271] / [i915#4613]) +1 similar issue
  *   igt@gem_pread@exhaustion:

     *   shard-skl: NOTRUN -> WARN<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22785/shard-skl6/igt@gem_pread@exhaustion.html> ([i915#2658])
  *   igt@gem_pxp@create-protected-buffer:

     *   shard-iclb: NOTRUN -> SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22785/shard-iclb7/igt@gem_pxp@create-protected-buffer.html> ([i915#4270]) +2 similar issues
  *   igt@gem_render_copy@yf-tiled-to-vebox-linear:

     *   shard-iclb: NOTRUN -> SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22785/shard-iclb5/igt@gem_render_copy@yf-tiled-to-vebox-linear.html> ([i915#768]) +1 similar issue
  *   igt@gem_softpin@allocator-evict-all-engines:

     *   shard-glk: PASS<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11456/shard-glk8/igt@gem_softpin@allocator-evict-all-engines.html> -> FAIL<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22785/shard-glk7/igt@gem_softpin@allocator-evict-all-engines.html> ([i915#4171])
  *   igt@gem_softpin@noreloc-s3:

     *   shard-glk: PASS<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11456/shard-glk6/igt@gem_softpin@noreloc-s3.html> -> SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22785/shard-glk8/igt@gem_softpin@noreloc-s3.html> ([fdo#109271])
  *   igt@gem_userptr_blits@input-checking:

     *   shard-skl: NOTRUN -> DMESG-WARN<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22785/shard-skl6/igt@gem_userptr_blits@input-checking.html> ([i915#4991]) +1 similar issue
  *   igt@gem_userptr_blits@unsync-overlap:

     *   shard-iclb: NOTRUN -> SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22785/shard-iclb8/igt@gem_userptr_blits@unsync-overlap.html> ([i915#3297])
  *   igt@gen7_exec_parse@chained-batch:

     *   shard-iclb: NOTRUN -> SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22785/shard-iclb7/igt@gen7_exec_parse@chained-batch.html> ([fdo#109289]) +2 similar issues
  *   igt@gen9_exec_parse@valid-registers:

     *   shard-iclb: NOTRUN -> SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22785/shard-iclb5/igt@gen9_exec_parse@valid-registers.html> ([i915#2856]) +1 similar issue
  *   igt@i915_pm_rc6_residency@rc6-idle:

     *   shard-iclb: NOTRUN -> WARN<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22785/shard-iclb5/igt@i915_pm_rc6_residency@rc6-idle.html> ([i915#2684])
  *   igt@i915_selftest@live@gt_pm:

     *   shard-skl: NOTRUN -> DMESG-FAIL<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22785/shard-skl6/igt@i915_selftest@live@gt_pm.html> ([i915#1886])
  *   igt@i915_selftest@live@hangcheck:

     *   shard-snb: PASS<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11456/shard-snb5/igt@i915_selftest@live@hangcheck.html> -> INCOMPLETE<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22785/shard-snb2/igt@i915_selftest@live@hangcheck.html> ([i915#3921])
  *   igt@i915_suspend@fence-restore-tiled2untiled:

     *   shard-skl: PASS<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11456/shard-skl5/igt@i915_suspend@fence-restore-tiled2untiled.html> -> INCOMPLETE<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22785/shard-skl2/igt@i915_suspend@fence-restore-tiled2untiled.html> ([i915#4939])
  *   igt@kms_async_flips@alternate-sync-async-flip:

     *   shard-glk: PASS<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11456/shard-glk9/igt@kms_async_flips@alternate-sync-async-flip.html> -> FAIL<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22785/shard-glk4/igt@kms_async_flips@alternate-sync-async-flip.html> ([i915#2521])
  *   igt@kms_big_fb@4-tiled-32bpp-rotate-0:

     *   shard-iclb: NOTRUN -> SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22785/shard-iclb7/igt@kms_big_fb@4-tiled-32bpp-rotate-0.html> ([i915#5286])
  *   igt@kms_big_fb@linear-8bpp-rotate-90:

     *   shard-iclb: NOTRUN -> SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22785/shard-iclb5/igt@kms_big_fb@linear-8bpp-rotate-90.html> ([fdo#110725] / [fdo#111614]) +2 similar issues
  *   igt@kms_big_fb@x-tiled-max-hw-stride-64bpp-rotate-180-async-flip:

     *   shard-skl: NOTRUN -> FAIL<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22785/shard-skl6/igt@kms_big_fb@x-tiled-max-hw-stride-64bpp-rotate-180-async-flip.html> ([i915#3743]) +2 similar issues
  *   igt@kms_big_fb@yf-tiled-64bpp-rotate-0:

     *   shard-iclb: NOTRUN -> SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22785/shard-iclb5/igt@kms_big_fb@yf-tiled-64bpp-rotate-0.html> ([fdo#110723])
  *   igt@kms_big_fb@yf-tiled-max-hw-stride-32bpp-rotate-0-hflip-async-flip:

     *   shard-skl: NOTRUN -> SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22785/shard-skl6/igt@kms_big_fb@yf-tiled-max-hw-stride-32bpp-rotate-0-hflip-async-flip.html> ([fdo#109271] / [i915#3777]) +5 similar issues
  *   igt@kms_big_joiner@2x-modeset:

     *   shard-iclb: NOTRUN -> SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22785/shard-iclb6/igt@kms_big_joiner@2x-modeset.html> ([i915#2705])
  *   igt@kms_ccs@pipe-a-random-ccs-data-y_tiled_gen12_mc_ccs:

     *   shard-iclb: NOTRUN -> SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22785/shard-iclb5/igt@kms_ccs@pipe-a-random-ccs-data-y_tiled_gen12_mc_ccs.html> ([fdo#109278] / [i915#3886]) +4 similar issues
  *   igt@kms_ccs@pipe-b-ccs-on-another-bo-y_tiled_gen12_mc_ccs:

     *   shard-skl: NOTRUN -> SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22785/shard-skl4/igt@kms_ccs@pipe-b-ccs-on-another-bo-y_tiled_gen12_mc_ccs.html> ([fdo#109271] / [i915#3886]) +15 similar issues
  *   igt@kms_ccs@pipe-c-crc-primary-rotation-180-yf_tiled_ccs:

     *   shard-tglb: NOTRUN -> SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22785/shard-tglb5/igt@kms_ccs@pipe-c-crc-primary-rotation-180-yf_tiled_ccs.html> ([fdo#111615] / [i915#3689])
  *   igt@kms_ccs@pipe-c-crc-sprite-planes-basic-y_tiled_gen12_rc_ccs_cc:

     *   shard-apl: NOTRUN -> SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22785/shard-apl1/igt@kms_ccs@pipe-c-crc-sprite-planes-basic-y_tiled_gen12_rc_ccs_cc.html> ([fdo#109271] / [i915#3886]) +2 similar issues
  *   igt@kms_chamelium@dp-frame-dump:

     *   shard-iclb: NOTRUN -> SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22785/shard-iclb8/igt@kms_chamelium@dp-frame-dump.html> ([fdo#109284] / [fdo#111827]) +9 similar issues
  *   igt@kms_chamelium@vga-hpd-for-each-pipe:

     *   shard-apl: NOTRUN -> SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22785/shard-apl1/igt@kms_chamelium@vga-hpd-for-each-pipe.html> ([fdo#109271] / [fdo#111827])
  *   igt@kms_color@pipe-d-ctm-max:

     *   shard-skl: NOTRUN -> SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22785/shard-skl6/igt@kms_color@pipe-d-ctm-max.html> ([fdo#109271]) +269 similar issues
  *   igt@kms_color@pipe-d-ctm-red-to-blue:

     *   shard-skl: NOTRUN -> SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22785/shard-skl10/igt@kms_color@pipe-d-ctm-red-to-blue.html> ([fdo#109271] / [i915#1888])
  *   igt@kms_color@pipe-d-degamma:

     *   shard-iclb: NOTRUN -> SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22785/shard-iclb5/igt@kms_color@pipe-d-degamma.html> ([fdo#109278] / [i915#1149]) +1 similar issue
  *   igt@kms_color_chamelium@pipe-b-ctm-max:

     *   shard-skl: NOTRUN -> SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22785/shard-skl9/igt@kms_color_chamelium@pipe-b-ctm-max.html> ([fdo#109271] / [fdo#111827]) +19 similar issues
  *   igt@kms_color_chamelium@pipe-b-gamma:

     *   shard-tglb: NOTRUN -> SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22785/shard-tglb5/igt@kms_color_chamelium@pipe-b-gamma.html> ([fdo#109284] / [fdo#111827])
  *   igt@kms_color_chamelium@pipe-d-ctm-negative:

     *   shard-iclb: NOTRUN -> SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22785/shard-iclb8/igt@kms_color_chamelium@pipe-d-ctm-negative.html> ([fdo#109278] / [fdo#109284] / [fdo#111827])
  *   igt@kms_cursor_crc@pipe-b-cursor-128x42-offscreen:

     *   shard-skl: NOTRUN -> DMESG-WARN<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22785/shard-skl6/igt@kms_cursor_crc@pipe-b-cursor-128x42-offscreen.html> ([i915#1982])
  *   igt@kms_cursor_crc@pipe-b-cursor-512x170-offscreen:

     *   shard-iclb: NOTRUN -> SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22785/shard-iclb7/igt@kms_cursor_crc@pipe-b-cursor-512x170-offscreen.html> ([fdo#109278] / [fdo#109279])
  *   igt@kms_cursor_crc@pipe-b-cursor-max-size-onscreen:

     *   shard-tglb: NOTRUN -> SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22785/shard-tglb5/igt@kms_cursor_crc@pipe-b-cursor-max-size-onscreen.html> ([i915#3359])
  *   igt@kms_cursor_edge_walk@pipe-d-256x256-left-edge:

     *   shard-iclb: NOTRUN -> SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22785/shard-iclb5/igt@kms_cursor_edge_walk@pipe-d-256x256-left-edge.html> ([fdo#109278]) +27 similar issues
  *   igt@kms_cursor_legacy@2x-cursor-vs-flip-legacy:

     *   shard-iclb: NOTRUN -> SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22785/shard-iclb8/igt@kms_cursor_legacy@2x-cursor-vs-flip-legacy.html> ([fdo#109274] / [fdo#109278]) +2 similar issues
  *   igt@kms_cursor_legacy@flip-vs-cursor-atomic-transitions-varying-size:

     *   shard-skl: NOTRUN -> FAIL<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22785/shard-skl10/igt@kms_cursor_legacy@flip-vs-cursor-atomic-transitions-varying-size.html> ([i915#2346] / [i915#533])
  *   igt@kms_dp_tiled_display@basic-test-pattern:

     *   shard-iclb: NOTRUN -> SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22785/shard-iclb6/igt@kms_dp_tiled_display@basic-test-pattern.html> ([i915#426])
  *   igt@kms_dp_tiled_display@basic-test-pattern-with-chamelium:

     *   shard-glk: NOTRUN -> SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22785/shard-glk6/igt@kms_dp_tiled_display@basic-test-pattern-with-chamelium.html> ([fdo#109271]) +1 similar issue

     *   shard-iclb: NOTRUN -> SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22785/shard-iclb8/igt@kms_dp_tiled_display@basic-test-pattern-with-chamelium.html> ([i915#3528])

  *   igt@kms_draw_crc@draw-method-xrgb8888-mmap-wc-4tiled:

     *   shard-iclb: NOTRUN -> SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22785/shard-iclb7/igt@kms_draw_crc@draw-method-xrgb8888-mmap-wc-4tiled.html> ([i915#5287]) +1 similar issue
  *   igt@kms_fbcon_fbt@fbc-suspend:

     *   shard-apl: PASS<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11456/shard-apl6/igt@kms_fbcon_fbt@fbc-suspend.html> -> INCOMPLETE<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22785/shard-apl1/igt@kms_fbcon_fbt@fbc-suspend.html> ([i915#180])
  *   igt@kms_flip@2x-flip-vs-panning-interruptible:

     *   shard-iclb: NOTRUN -> SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22785/shard-iclb5/igt@kms_flip@2x-flip-vs-panning-interruptible.html> ([fdo#109274]) +3 similar issues
  *   igt@kms_flip@flip-vs-expired-vblank-interruptible@b-hdmi-a1:

     *   shard-glk: PASS<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11456/shard-glk7/igt@kms_flip@flip-vs-expired-vblank-interruptible@b-hdmi-a1.html> -> FAIL<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22785/shard-glk5/igt@kms_flip@flip-vs-expired-vblank-interruptible@b-hdmi-a1.html> ([i915#79])
  *   igt@kms_flip@flip-vs-expired-vblank@b-edp1:

     *   shard-skl: PASS<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11456/shard-skl1/igt@kms_flip@flip-vs-expired-vblank@b-edp1.html> -> FAIL<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22785/shard-skl8/igt@kms_flip@flip-vs-expired-vblank@b-edp1.html> ([i915#79])
  *   igt@kms_flip@flip-vs-suspend-interruptible@c-dp1:

     *   shard-apl: PASS<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11456/shard-apl2/igt@kms_flip@flip-vs-suspend-interruptible@c-dp1.html> -> DMESG-WARN<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22785/shard-apl8/igt@kms_flip@flip-vs-suspend-interruptible@c-dp1.html> ([i915#180]) +7 similar issues
  *   igt@kms_flip_scaled_crc@flip-64bpp-ytile-to-32bpp-ytilercccs-upscaling:

     *   shard-iclb: NOTRUN -> SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22785/shard-iclb8/igt@kms_flip_scaled_crc@flip-64bpp-ytile-to-32bpp-ytilercccs-upscaling.html> ([i915#2587])
  *   igt@kms_frontbuffer_tracking@fbc-2p-primscrn-cur-indfb-draw-blt:

     *   shard-iclb: NOTRUN -> SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22785/shard-iclb8/igt@kms_frontbuffer_tracking@fbc-2p-primscrn-cur-indfb-draw-blt.html> ([fdo#109280]) +16 similar issues
  *   igt@kms_frontbuffer_tracking@fbc-2p-primscrn-pri-indfb-draw-mmap-cpu:

     *   shard-tglb: NOTRUN -> SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22785/shard-tglb5/igt@kms_frontbuffer_tracking@fbc-2p-primscrn-pri-indfb-draw-mmap-cpu.html> ([fdo#109280] / [fdo#111825]) +1 similar issue
  *   igt@kms_frontbuffer_tracking@psr-2p-scndscrn-cur-indfb-draw-pwrite:

     *   shard-apl: NOTRUN -> SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22785/shard-apl1/igt@kms_frontbuffer_tracking@psr-2p-scndscrn-cur-indfb-draw-pwrite.html> ([fdo#109271]) +22 similar issues
  *   igt@kms_pipe_crc_basic@read-crc-pipe-d-frame-sequence:

     *   shard-skl: NOTRUN -> SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22785/shard-skl4/igt@kms_pipe_crc_basic@read-crc-pipe-d-frame-sequence.html> ([fdo#109271] / [i915#533])
  *   igt@kms_plane_alpha_blend@pipe-a-alpha-transparent-fb:

     *   shard-skl: NOTRUN -> FAIL<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22785/shard-skl1/igt@kms_plane_alpha_blend@pipe-a-alpha-transparent-fb.html> ([i915#265]) +1 similar issue
  *   igt@kms_plane_alpha_blend@pipe-a-constant-alpha-min:

     *   shard-skl: NOTRUN -> FAIL<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22785/shard-skl6/igt@kms_plane_alpha_blend@pipe-a-constant-alpha-min.html> ([fdo#108145] / [i915#265]) +2 similar issues
  *   igt@kms_plane_lowres@pipe-b-tiling-y:

     *   shard-iclb: NOTRUN -> SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22785/shard-iclb8/igt@kms_plane_lowres@pipe-b-tiling-y.html> ([i915#3536])
  *   igt@kms_plane_scaling@planes-upscale-20x20-downscale-factor-0-25@pipe-a-edp-1-planes-upscale-downscale:

     *   shard-iclb: NOTRUN -> SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22785/shard-iclb6/igt@kms_plane_scaling@planes-upscale-20x20-downscale-factor-0-25@pipe-a-edp-1-planes-upscale-downscale.html> ([i915#5235]) +2 similar issues
  *   igt@kms_plane_scaling@planes-upscale-factor-0-25-downscale-factor-0-5@pipe-c-edp-1-planes-upscale-downscale:

     *   shard-iclb: PASS<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11456/shard-iclb5/igt@kms_plane_scaling@planes-upscale-factor-0-25-downscale-factor-0-5@pipe-c-edp-1-planes-upscale-downscale.html> -> SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22785/shard-iclb2/igt@kms_plane_scaling@planes-upscale-factor-0-25-downscale-factor-0-5@pipe-c-edp-1-planes-upscale-downscale.html> ([i915#5235]) +2 similar issues
  *   igt@kms_psr2_sf@primary-plane-update-sf-dmg-area:

     *   shard-skl: NOTRUN -> SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22785/shard-skl4/igt@kms_psr2_sf@primary-plane-update-sf-dmg-area.html> ([fdo#109271] / [i915#658]) +2 similar issues
  *   igt@kms_psr2_su@frontbuffer-xrgb8888:

     *   shard-iclb: PASS<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11456/shard-iclb2/igt@kms_psr2_su@frontbuffer-xrgb8888.html> -> SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22785/shard-iclb4/igt@kms_psr2_su@frontbuffer-xrgb8888.html> ([fdo#109642] / [fdo#111068] / [i915#658])
  *   igt@kms_psr@psr2_cursor_render:

     *   shard-iclb: NOTRUN -> SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22785/shard-iclb7/igt@kms_psr@psr2_cursor_render.html> ([fdo#109441]) +1 similar issue
  *   igt@kms_scaling_modes@scaling-mode-none@edp-1-pipe-c:

     *   shard-iclb: NOTRUN -> SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22785/shard-iclb7/igt@kms_scaling_modes@scaling-mode-none@edp-1-pipe-c.html> ([i915#5030]) +2 similar issues
  *   igt@kms_tv_load_detect@load-detect:

     *   shard-iclb: NOTRUN -> SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22785/shard-iclb7/igt@kms_tv_load_detect@load-detect.html> ([fdo#109309])
  *   igt@kms_vblank@pipe-b-ts-continuation-suspend:

     *   shard-kbl: PASS<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11456/shard-kbl3/igt@kms_vblank@pipe-b-ts-continuation-suspend.html> -> INCOMPLETE<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22785/shard-kbl4/igt@kms_vblank@pipe-b-ts-continuation-suspend.html> ([i915#2828])
  *   igt@kms_vrr@flip-dpms:

     *   shard-iclb: NOTRUN -> SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22785/shard-iclb8/igt@kms_vrr@flip-dpms.html> ([fdo#109502])
  *   igt@kms_writeback@writeback-pixel-formats:

     *   shard-skl: NOTRUN -> SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22785/shard-skl9/igt@kms_writeback@writeback-pixel-formats.html> ([fdo#109271] / [i915#2437]) +1 similar issue

     *   shard-apl: NOTRUN -> SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22785/shard-apl1/igt@kms_writeback@writeback-pixel-formats.html> ([fdo#109271] / [i915#2437])

  *   igt@nouveau_crc@pipe-b-source-rg:

     *   shard-iclb: NOTRUN -> SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22785/shard-iclb8/igt@nouveau_crc@pipe-b-source-rg.html> ([i915#2530]) +2 similar issues
  *   igt@prime_nv_pcopy@test3_5:

     *   shard-iclb: NOTRUN -> SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22785/shard-iclb5/igt@prime_nv_pcopy@test3_5.html> ([fdo#109291])
  *   igt@prime_vgem@basic-userptr:

     *   shard-iclb: NOTRUN -> SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22785/shard-iclb7/igt@prime_vgem@basic-userptr.html> ([i915#3301])
  *   igt@sysfs_clients@busy:

     *   shard-skl: NOTRUN -> SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22785/shard-skl6/igt@sysfs_clients@busy.html> ([fdo#109271] / [i915#2994]) +2 similar issues
  *   igt@sysfs_clients@split-10:

     *   shard-iclb: NOTRUN -> SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22785/shard-iclb5/igt@sysfs_clients@split-10.html> ([i915#2994])

Possible fixes

  *   igt@gem_eio@in-flight-contexts-1us:

     *   shard-iclb: TIMEOUT<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11456/shard-iclb5/igt@gem_eio@in-flight-contexts-1us.html> ([i915#3070]) -> PASS<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22785/shard-iclb1/igt@gem_eio@in-flight-contexts-1us.html>
  *   igt@gem_exec_fair@basic-flow@rcs0:

     *   shard-tglb: FAIL<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11456/shard-tglb1/igt@gem_exec_fair@basic-flow@rcs0.html> ([i915#2842]) -> PASS<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22785/shard-tglb5/igt@gem_exec_fair@basic-flow@rcs0.html>
  *   igt@gem_exec_fair@basic-none-vip@rcs0:

     *   shard-kbl: FAIL<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11456/shard-kbl6/igt@gem_exec_fair@basic-none-vip@rcs0.html> ([i915#2842]) -> PASS<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22785/shard-kbl3/igt@gem_exec_fair@basic-none-vip@rcs0.html>
  *   igt@gem_exec_fair@basic-pace@vcs0:

     *   shard-iclb: FAIL<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11456/shard-iclb4/igt@gem_exec_fair@basic-pace@vcs0.html> ([i915#2842]) -> PASS<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22785/shard-iclb8/igt@gem_exec_fair@basic-pace@vcs0.html>
  *   igt@gem_exec_fair@basic-throttle@rcs0:

     *   shard-glk: FAIL<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11456/shard-glk7/igt@gem_exec_fair@basic-throttle@rcs0.html> ([i915#2842]) -> PASS<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22785/>
diff mbox series

Patch

diff --git a/drivers/gpu/drm/i915/display/intel_psr.c b/drivers/gpu/drm/i915/display/intel_psr.c
index 80002ca6a6ebe..6e3ae2c4430c7 100644
--- a/drivers/gpu/drm/i915/display/intel_psr.c
+++ b/drivers/gpu/drm/i915/display/intel_psr.c
@@ -1436,14 +1436,19 @@  void intel_psr_resume(struct intel_dp *intel_dp)
 	mutex_unlock(&psr->lock);
 }
 
-static inline u32 man_trk_ctl_single_full_frame_bit_get(struct drm_i915_private *dev_priv)
+static u32 man_trk_ctl_enable_bit_get(struct drm_i915_private *dev_priv)
+{
+	return IS_ALDERLAKE_P(dev_priv) ? 0 : PSR2_MAN_TRK_CTL_ENABLE;
+}
+
+static u32 man_trk_ctl_single_full_frame_bit_get(struct drm_i915_private *dev_priv)
 {
 	return IS_ALDERLAKE_P(dev_priv) ?
 	       ADLP_PSR2_MAN_TRK_CTL_SF_SINGLE_FULL_FRAME :
 	       PSR2_MAN_TRK_CTL_SF_SINGLE_FULL_FRAME;
 }
 
-static inline u32 man_trk_ctl_partial_frame_bit_get(struct drm_i915_private *dev_priv)
+static u32 man_trk_ctl_partial_frame_bit_get(struct drm_i915_private *dev_priv)
 {
 	return IS_ALDERLAKE_P(dev_priv) ?
 	       ADLP_PSR2_MAN_TRK_CTL_SF_PARTIAL_FRAME_UPDATE :
@@ -1455,9 +1460,11 @@  static void psr_force_hw_tracking_exit(struct intel_dp *intel_dp)
 	struct drm_i915_private *dev_priv = dp_to_i915(intel_dp);
 
 	if (intel_dp->psr.psr2_sel_fetch_enabled)
-		intel_de_rmw(dev_priv,
-			     PSR2_MAN_TRK_CTL(intel_dp->psr.transcoder), 0,
-			     man_trk_ctl_single_full_frame_bit_get(dev_priv));
+		intel_de_write(dev_priv,
+			       PSR2_MAN_TRK_CTL(intel_dp->psr.transcoder),
+			       man_trk_ctl_enable_bit_get(dev_priv) |
+			       man_trk_ctl_partial_frame_bit_get(dev_priv) |
+			       man_trk_ctl_single_full_frame_bit_get(dev_priv));
 
 	/*
 	 * Display WA #0884: skl+
@@ -1554,10 +1561,7 @@  static void psr2_man_trk_ctl_calc(struct intel_crtc_state *crtc_state,
 {
 	struct intel_crtc *crtc = to_intel_crtc(crtc_state->uapi.crtc);
 	struct drm_i915_private *dev_priv = to_i915(crtc->base.dev);
-	u32 val = 0;
-
-	if (!IS_ALDERLAKE_P(dev_priv))
-		val = PSR2_MAN_TRK_CTL_ENABLE;
+	u32 val = man_trk_ctl_enable_bit_get(dev_priv);
 
 	/* SF partial frame enable has to be set even on full update */
 	val |= man_trk_ctl_partial_frame_bit_get(dev_priv);