| Message ID | 20221101115342.1136720-1-jouni.hogander@intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | drm/i915/mtl: Fix PSR2_MAN_TRK_CTL bit getter functions for MTL | expand |
On Tue, 2022-11-01 at 13:53 +0200, Jouni Högander wrote: > MTL shares PSR2_MAN_TRK_CTL bits with ADL. Currently some bit > getter functions are incorrect for MTL. This patch fixes those. > > Bspec: 49274 Reviewed-by: José Roberto de Souza <jose.souza@intel.com> > > Cc: José Roberto de Souza <jose.souza@intel.com> > Cc: Mika Kahola <mika.kahola@intel.com> > Cc: Radhakrishna Sripada <radhakrishna.sripada@intel.com> > > Fixes: 47d4ae2192cb ("drm/i915/mtl: Extend PSR support") > Signed-off-by: Jouni Högander <jouni.hogander@intel.com> > --- > drivers/gpu/drm/i915/display/intel_psr.c | 7 ++++--- > 1 file changed, 4 insertions(+), 3 deletions(-) > > diff --git a/drivers/gpu/drm/i915/display/intel_psr.c b/drivers/gpu/drm/i915/display/intel_psr.c > index 904a1049eff3..4bfb8313738e 100644 > --- a/drivers/gpu/drm/i915/display/intel_psr.c > +++ b/drivers/gpu/drm/i915/display/intel_psr.c > @@ -1470,7 +1470,8 @@ void intel_psr_resume(struct intel_dp *intel_dp) > > 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; > + return IS_ALDERLAKE_P(dev_priv) || DISPLAY_VER(dev_priv) >= 14 ? 0 : > + PSR2_MAN_TRK_CTL_ENABLE; > } > > static u32 man_trk_ctl_single_full_frame_bit_get(struct drm_i915_private *dev_priv) > @@ -1482,14 +1483,14 @@ static u32 man_trk_ctl_single_full_frame_bit_get(struct drm_i915_private *dev_pr > > static u32 man_trk_ctl_partial_frame_bit_get(struct drm_i915_private *dev_priv) > { > - return IS_ALDERLAKE_P(dev_priv) ? > + return IS_ALDERLAKE_P(dev_priv) || DISPLAY_VER(dev_priv) >= 14 ? > ADLP_PSR2_MAN_TRK_CTL_SF_PARTIAL_FRAME_UPDATE : > PSR2_MAN_TRK_CTL_SF_PARTIAL_FRAME_UPDATE; > } > > static u32 man_trk_ctl_continuos_full_frame(struct drm_i915_private *dev_priv) > { > - return IS_ALDERLAKE_P(dev_priv) ? > + return IS_ALDERLAKE_P(dev_priv) || DISPLAY_VER(dev_priv) >= 14 ? > ADLP_PSR2_MAN_TRK_CTL_SF_CONTINUOS_FULL_FRAME : > PSR2_MAN_TRK_CTL_SF_CONTINUOS_FULL_FRAME; > }
I checked possible new issues found by CI and I'm sure they are not related to my patch.
BR,
Jouni Högander
On Tue, 2022-11-01 at 18:34 +0000, Patchwork wrote:
Patch Details
Series: drm/i915/mtl: Fix PSR2_MAN_TRK_CTL bit getter functions for MTL
URL: https://patchwork.freedesktop.org/series/110375/
State: failure
Details: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110375v1/index.html
CI Bug Log - changes from CI_DRM_12325_full -> Patchwork_110375v1_full
Summary
FAILURE
Serious unknown changes coming with Patchwork_110375v1_full absolutely need to be
verified manually.
If you think the reported changes have nothing to do with the changes
introduced in Patchwork_110375v1_full, please notify your bug team to allow them
to document this new failure mode, which will reduce false positives in CI.
Participating hosts (11 -> 9)
Missing (2): shard-rkl shard-dg1
Possible new issues
Here are the unknown changes that may have been introduced in Patchwork_110375v1_full:
IGT changes
Possible regressions
* igt@gem_exec_whisper@basic-queues-forked:
* shard-iclb: PASS<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12325/shard-iclb5/igt@gem_exec_whisper@basic-queues-forked.html> -> INCOMPLETE<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110375v1/shard-iclb7/igt@gem_exec_whisper@basic-queues-forked.html>
* igt@kms_flip_scaled_crc@flip-32bpp-ytileccs-to-64bpp-ytile-downscaling@pipe-a-valid-mode:
* shard-iclb: PASS<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12325/shard-iclb7/igt@kms_flip_scaled_crc@flip-32bpp-ytileccs-to-64bpp-ytile-downscaling@pipe-a-valid-mode.html> -> FAIL<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110375v1/shard-iclb8/igt@kms_flip_scaled_crc@flip-32bpp-ytileccs-to-64bpp-ytile-downscaling@pipe-a-valid-mode.html>
Known issues
Here are the changes found in Patchwork_110375v1_full that come from known issues:
CI changes
Issues hit
* boot:
* shard-glk: (PASS<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12325/shard-glk5/boot.html>, PASS<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12325/shard-glk5/boot.html>, PASS<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12325/shard-glk3/boot.html>, PASS<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12325/shard-glk3/boot.html>, PASS<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12325/shard-glk3/boot.html>, PASS<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12325/shard-glk2/boot.html>, PASS<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12325/shard-glk2/boot.html>, PASS<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12325/shard-glk2/boot.html>, PASS<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12325/shard-glk1/boot.html>, PASS<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12325/shard-glk1/boot.html>, PASS<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12325/shard-glk1/boot.html>, PASS<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12325/shard-glk9/boot.html>, PASS<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12325/shard-glk9/boot.html>, PASS<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12325/shard-glk9/boot.html>, PASS<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12325/shard-glk9/boot.html>, PASS<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12325/shard-glk8/boot.html>, PASS<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12325/shard-glk8/boot.html>, PASS<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12325/shard-glk8/boot.html>, PASS<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12325/shard-glk7/boot.html>, PASS<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12325/shard-glk7/boot.html>, PASS<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12325/shard-glk7/boot.html>, PASS<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12325/shard-glk6/boot.html>, PASS<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12325/shard-glk6/boot.html>, PASS<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12325/shard-glk6/boot.html>, PASS<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12325/shard-glk5/boot.html>) -> (PASS<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110375v1/shard-glk9/boot.html>, PASS<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110375v1/shard-glk9/boot.html>, PASS<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110375v1/shard-glk9/boot.html>, PASS<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110375v1/shard-glk8/boot.html>, PASS<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110375v1/shard-glk8/boot.html>, FAIL<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110375v1/shard-glk1/boot.html>, PASS<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110375v1/shard-glk1/boot.html>, PASS<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110375v1/shard-glk8/boot.html>, PASS<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110375v1/shard-glk1/boot.html>, PASS<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110375v1/shard-glk7/boot.html>, PASS<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110375v1/shard-glk7/boot.html>, PASS<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110375v1/shard-glk1/boot.html>, PASS<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110375v1/shard-glk7/boot.html>, PASS<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110375v1/shard-glk6/boot.html>, PASS<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110375v1/shard-glk6/boot.html>, PASS<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110375v1/shard-glk6/boot.html>, PASS<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110375v1/shard-glk5/boot.html>, PASS<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110375v1/shard-glk5/boot.html>, PASS<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110375v1/shard-glk3/boot.html>, PASS<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110375v1/shard-glk3/boot.html>, PASS<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110375v1/shard-glk3/boot.html>, PASS<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110375v1/shard-glk3/boot.html>, PASS<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110375v1/shard-glk2/boot.html>, PASS<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110375v1/shard-glk2/boot.html>, PASS<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110375v1/shard-glk2/boot.html>) (i915#4392<https://gitlab.freedesktop.org/drm/intel/issues/4392>)
IGT changes
Issues hit
* igt@dmabuf@all@dma_fence_chain:
* shard-skl: NOTRUN -> INCOMPLETE<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110375v1/shard-skl1/igt@dmabuf@all@dma_fence_chain.html> (i915#6949<https://gitlab.freedesktop.org/drm/intel/issues/6949>)
* igt@gem_exec_balancer@parallel-bb-first:
* shard-iclb: PASS<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12325/shard-iclb2/igt@gem_exec_balancer@parallel-bb-first.html> -> SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110375v1/shard-iclb6/igt@gem_exec_balancer@parallel-bb-first.html> (i915#4525<https://gitlab.freedesktop.org/drm/intel/issues/4525>) +2 similar issues
* igt@gem_exec_fair@basic-none@vcs1:
* shard-iclb: NOTRUN -> FAIL<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110375v1/shard-iclb2/igt@gem_exec_fair@basic-none@vcs1.html> (i915#2842<https://gitlab.freedesktop.org/drm/intel/issues/2842>)
* igt@gem_exec_fair@basic-pace-share@rcs0:
* shard-glk: PASS<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12325/shard-glk3/igt@gem_exec_fair@basic-pace-share@rcs0.html> -> FAIL<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110375v1/shard-glk5/igt@gem_exec_fair@basic-pace-share@rcs0.html> (i915#2842<https://gitlab.freedesktop.org/drm/intel/issues/2842>)
* igt@gem_exec_suspend@basic-s3@smem:
* shard-apl: PASS<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12325/shard-apl8/igt@gem_exec_suspend@basic-s3@smem.html> -> DMESG-WARN<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110375v1/shard-apl8/igt@gem_exec_suspend@basic-s3@smem.html> (i915#180<https://gitlab.freedesktop.org/drm/intel/issues/180>) +1 similar issue
* igt@gem_huc_copy@huc-copy:
* shard-tglb: PASS<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12325/shard-tglb3/igt@gem_huc_copy@huc-copy.html> -> SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110375v1/shard-tglb6/igt@gem_huc_copy@huc-copy.html> (i915#2190<https://gitlab.freedesktop.org/drm/intel/issues/2190>)
* igt@gem_lmem_swapping@heavy-verify-multi:
* shard-skl: NOTRUN -> SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110375v1/shard-skl4/igt@gem_lmem_swapping@heavy-verify-multi.html> (fdo#109271<https://bugs.freedesktop.org/show_bug.cgi?id=109271> / i915#4613<https://gitlab.freedesktop.org/drm/intel/issues/4613>) +1 similar issue
* igt@gem_softpin@evict-single-offset:
* shard-iclb: PASS<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12325/shard-iclb1/igt@gem_softpin@evict-single-offset.html> -> FAIL<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110375v1/shard-iclb8/igt@gem_softpin@evict-single-offset.html> (i915#4171<https://gitlab.freedesktop.org/drm/intel/issues/4171>)
* igt@gen9_exec_parse@allowed-all:
* shard-skl: PASS<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12325/shard-skl10/igt@gen9_exec_parse@allowed-all.html> -> DMESG-WARN<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110375v1/shard-skl10/igt@gen9_exec_parse@allowed-all.html> (i915#5566<https://gitlab.freedesktop.org/drm/intel/issues/5566> / i915#716<https://gitlab.freedesktop.org/drm/intel/issues/716>)
* igt@i915_module_load@load:
* shard-skl: NOTRUN -> SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110375v1/shard-skl4/igt@i915_module_load@load.html> (fdo#109271<https://bugs.freedesktop.org/show_bug.cgi?id=109271> / i915#6227<https://gitlab.freedesktop.org/drm/intel/issues/6227>)
* igt@i915_pm_backlight@fade:
* shard-iclb: PASS<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12325/shard-iclb7/igt@i915_pm_backlight@fade.html> -> DMESG-WARN<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110375v1/shard-iclb8/igt@i915_pm_backlight@fade.html> (i915#402<https://gitlab.freedesktop.org/drm/intel/issues/402>)
* igt@i915_selftest@live@gt_pm:
* shard-skl: NOTRUN -> DMESG-FAIL<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110375v1/shard-skl9/igt@i915_selftest@live@gt_pm.html> (i915#1886<https://gitlab.freedesktop.org/drm/intel/issues/1886>)
* igt@kms_ccs@pipe-a-crc-primary-basic-y_tiled_gen12_mc_ccs:
* shard-skl: NOTRUN -> SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110375v1/shard-skl9/igt@kms_ccs@pipe-a-crc-primary-basic-y_tiled_gen12_mc_ccs.html> (fdo#109271<https://bugs.freedesktop.org/show_bug.cgi?id=109271> / i915#3886<https://gitlab.freedesktop.org/drm/intel/issues/3886>)
* igt@kms_chamelium@hdmi-crc-multiple:
* shard-skl: NOTRUN -> SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110375v1/shard-skl9/igt@kms_chamelium@hdmi-crc-multiple.html> (fdo#109271<https://bugs.freedesktop.org/show_bug.cgi?id=109271> / fdo#111827<https://bugs.freedesktop.org/show_bug.cgi?id=111827>) +5 similar issues
* igt@kms_flip_scaled_crc@flip-32bpp-4tile-to-64bpp-4tile-downscaling@pipe-a-valid-mode:
* shard-iclb: NOTRUN -> SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110375v1/shard-iclb6/igt@kms_flip_scaled_crc@flip-32bpp-4tile-to-64bpp-4tile-downscaling@pipe-a-valid-mode.html> (i915#2587<https://gitlab.freedesktop.org/drm/intel/issues/2587> / i915#2672<https://gitlab.freedesktop.org/drm/intel/issues/2672>)
* igt@kms_flip_scaled_crc@flip-32bpp-ytile-to-32bpp-ytilegen12rcccs-downscaling@pipe-a-default-mode:
* shard-iclb: NOTRUN -> SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110375v1/shard-iclb3/igt@kms_flip_scaled_crc@flip-32bpp-ytile-to-32bpp-ytilegen12rcccs-downscaling@pipe-a-default-mode.html> (i915#2672<https://gitlab.freedesktop.org/drm/intel/issues/2672> / i915#3555<https://gitlab.freedesktop.org/drm/intel/issues/3555>)
* igt@kms_flip_scaled_crc@flip-64bpp-linear-to-16bpp-linear-downscaling@pipe-a-default-mode:
* shard-iclb: PASS<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12325/shard-iclb3/igt@kms_flip_scaled_crc@flip-64bpp-linear-to-16bpp-linear-downscaling@pipe-a-default-mode.html> -> SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110375v1/shard-iclb2/igt@kms_flip_scaled_crc@flip-64bpp-linear-to-16bpp-linear-downscaling@pipe-a-default-mode.html> (i915#3555<https://gitlab.freedesktop.org/drm/intel/issues/3555>)
* igt@kms_flip_scaled_crc@flip-64bpp-yftile-to-32bpp-yftile-upscaling@pipe-a-default-mode:
* shard-iclb: NOTRUN -> SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110375v1/shard-iclb3/igt@kms_flip_scaled_crc@flip-64bpp-yftile-to-32bpp-yftile-upscaling@pipe-a-default-mode.html> (i915#2672<https://gitlab.freedesktop.org/drm/intel/issues/2672>) +5 similar issues
* igt@kms_frontbuffer_tracking@fbc-1p-offscren-pri-indfb-draw-mmap-gtt:
* shard-skl: NOTRUN -> SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110375v1/shard-skl1/igt@kms_frontbuffer_tracking@fbc-1p-offscren-pri-indfb-draw-mmap-gtt.html> (fdo#109271<https://bugs.freedesktop.org/show_bug.cgi?id=109271>) +122 similar issues
* igt@kms_frontbuffer_tracking@fbc-rgb565-draw-mmap-wc:
* shard-snb: PASS<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12325/shard-snb2/igt@kms_frontbuffer_tracking@fbc-rgb565-draw-mmap-wc.html> -> SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110375v1/shard-snb7/igt@kms_frontbuffer_tracking@fbc-rgb565-draw-mmap-wc.html> (fdo#109271<https://bugs.freedesktop.org/show_bug.cgi?id=109271>) +2 similar issues
* igt@kms_frontbuffer_tracking@fbcpsr-1p-primscrn-shrfb-pgflip-blt:
* shard-iclb: PASS<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12325/shard-iclb7/igt@kms_frontbuffer_tracking@fbcpsr-1p-primscrn-shrfb-pgflip-blt.html> -> FAIL<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110375v1/shard-iclb8/igt@kms_frontbuffer_tracking@fbcpsr-1p-primscrn-shrfb-pgflip-blt.html> (i915#2546<https://gitlab.freedesktop.org/drm/intel/issues/2546>)
* igt@kms_plane_alpha_blend@alpha-transparent-fb@pipe-c-edp-1:
* shard-skl: NOTRUN -> FAIL<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110375v1/shard-skl6/igt@kms_plane_alpha_blend@alpha-transparent-fb@pipe-c-edp-1.html> (i915#4573<https://gitlab.freedesktop.org/drm/intel/issues/4573>) +5 similar issues
* igt@kms_plane_scaling@plane-scaler-with-clipping-clamping-pixel-formats@pipe-b-edp-1:
* shard-iclb: PASS<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12325/shard-iclb5/igt@kms_plane_scaling@plane-scaler-with-clipping-clamping-pixel-formats@pipe-b-edp-1.html> -> SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110375v1/shard-iclb3/igt@kms_plane_scaling@plane-scaler-with-clipping-clamping-pixel-formats@pipe-b-edp-1.html> (i915#5176<https://gitlab.freedesktop.org/drm/intel/issues/5176>) +1 similar issue
* igt@kms_plane_scaling@planes-downscale-factor-0-5@pipe-a-edp-1:
* shard-iclb: PASS<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12325/shard-iclb3/igt@kms_plane_scaling@planes-downscale-factor-0-5@pipe-a-edp-1.html> -> SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110375v1/shard-iclb2/igt@kms_plane_scaling@planes-downscale-factor-0-5@pipe-a-edp-1.html> (i915#5235<https://gitlab.freedesktop.org/drm/intel/issues/5235>) +2 similar issues
* igt@kms_psr2_sf@overlay-plane-move-continuous-exceed-fully-sf:
* shard-skl: NOTRUN -> SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110375v1/shard-skl4/igt@kms_psr2_sf@overlay-plane-move-continuous-exceed-fully-sf.html> (fdo#109271<https://bugs.freedesktop.org/show_bug.cgi?id=109271> / i915#658<https://gitlab.freedesktop.org/drm/intel/issues/658>)
* igt@kms_psr2_su@frontbuffer-xrgb8888:
* shard-iclb: NOTRUN -> SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110375v1/shard-iclb6/igt@kms_psr2_su@frontbuffer-xrgb8888.html> (fdo#109642<https://bugs.freedesktop.org/show_bug.cgi?id=109642> / fdo#111068<https://bugs.freedesktop.org/show_bug.cgi?id=111068> / i915#658<https://gitlab.freedesktop.org/drm/intel/issues/658>)
* igt@kms_psr@psr2_sprite_plane_onoff:
* shard-iclb: PASS<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12325/shard-iclb2/igt@kms_psr@psr2_sprite_plane_onoff.html> -> SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110375v1/shard-iclb6/igt@kms_psr@psr2_sprite_plane_onoff.html> (fdo#109441<https://bugs.freedesktop.org/show_bug.cgi?id=109441>) +2 similar issues
* igt@kms_rotation_crc@primary-y-tiled-reflect-x-180:
* shard-apl: NOTRUN -> SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110375v1/shard-apl1/igt@kms_rotation_crc@primary-y-tiled-reflect-x-180.html> (fdo#109271<https://bugs.freedesktop.org/show_bug.cgi?id=109271>) +1 similar issue
* igt@kms_writeback@writeback-fb-id:
* shard-skl: NOTRUN -> SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110375v1/shard-skl1/igt@kms_writeback@writeback-fb-id.html> (fdo#109271<https://bugs.freedesktop.org/show_bug.cgi?id=109271> / i915#2437<https://gitlab.freedesktop.org/drm/intel/issues/2437>) +1 similar issue
* igt@perf@blocking:
* shard-skl: PASS<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12325/shard-skl3/igt@perf@blocking.html> -> FAIL<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110375v1/shard-skl3/igt@perf@blocking.html> (i915#1542<https://gitlab.freedesktop.org/drm/intel/issues/1542>)
* igt@sysfs_clients@pidname:
* shard-skl: NOTRUN -> SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110375v1/shard-skl4/igt@sysfs_clients@pidname.html> (fdo#109271<https://bugs.freedesktop.org/show_bug.cgi?id=109271> / i915#2994<https://gitlab.freedesktop.org/drm/intel/issues/2994>)
Possible fixes
* igt@feature_discovery@psr2:
* shard-iclb: SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12325/shard-iclb3/igt@feature_discovery@psr2.html> (i915#658<https://gitlab.freedesktop.org/drm/intel/issues/658>) -> PASS<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110375v1/shard-iclb2/igt@feature_discovery@psr2.html>
* igt@gem_exec_balancer@parallel-out-fence:
* shard-iclb: SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12325/shard-iclb7/igt@gem_exec_balancer@parallel-out-fence.html> (i915#4525<https://gitlab.freedesktop.org/drm/intel/issues/4525>) -> PASS<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110375v1/shard-iclb2/igt@gem_exec_balancer@parallel-out-fence.html>
* igt@gen9_exec_parse@allowed-single:
* shard-apl: DMESG-WARN<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12325/shard-apl7/igt@gen9_exec_parse@allowed-single.html> (i915#5566<https://gitlab.freedesktop.org/drm/intel/issues/5566> / i915#716<https://gitlab.freedesktop.org/drm/intel/issues/716>) -> PASS<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110375v1/shard-apl1/igt@gen9_exec_parse@allowed-single.html>
* igt@kms_cursor_legacy@flip-vs-cursor@atomic-transitions-varying-size:
* shard-glk: FAIL<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12325/shard-glk9/igt@kms_cursor_legacy@flip-vs-cursor@atomic-transitions-varying-size.html> (i915#2346<https://gitlab.freedesktop.org/drm/intel/issues/2346>) -> PASS<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110375v1/shard-glk7/igt@kms_cursor_legacy@flip-vs-cursor@atomic-transitions-varying-size.html> +1 similar issue
* igt@kms_flip@flip-vs-expired-vblank@c-dp1:
* shard-apl: FAIL<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12325/shard-apl3/igt@kms_flip@flip-vs-expired-vblank@c-dp1.html> (i915#79<https://gitlab.freedesktop.org/drm/intel/issues/79>) -> PASS<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110375v1/shard-apl6/igt@kms_flip@flip-vs-expired-vblank@c-dp1.html>
* igt@kms_flip@wf_vblank-ts-check@a-edp1:
* shard-skl: FAIL<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12325/shard-skl3/igt@kms_flip@wf_vblank-ts-check@a-edp1.html> (i915#2122<https://gitlab.freedesktop.org/drm/intel/issues/2122>) -> PASS<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110375v1/shard-skl9/igt@kms_flip@wf_vblank-ts-check@a-edp1.html> +1 similar issue
* igt@kms_psr@psr2_no_drrs:
* shard-iclb: SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12325/shard-iclb7/igt@kms_psr@psr2_no_drrs.html> (fdo#109441<https://bugs.freedesktop.org/show_bug.cgi?id=109441>) -> PASS<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110375v1/shard-iclb2/igt@kms_psr@psr2_no_drrs.html> +1 similar issue
* igt@perf_pmu@all-busy-idle-check-all:
* shard-skl: DMESG-WARN<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12325/shard-skl6/igt@perf_pmu@all-busy-idle-check-all.html> (i915#1982<https://gitlab.freedesktop.org/drm/intel/issues/1982>) -> PASS<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110375v1/shard-skl4/igt@perf_pmu@all-busy-idle-check-all.html>
* igt@perf_pmu@interrupts:
* shard-skl: FAIL<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12325/shard-skl7/igt@perf_pmu@interrupts.html> (i915#7318<https://gitlab.freedesktop.org/drm/intel/issues/7318>) -> PASS<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110375v1/shard-skl4/igt@perf_pmu@interrupts.html>
Warnings
* igt@gem_exec_balancer@parallel-ordering:
* shard-iclb: SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12325/shard-iclb6/igt@gem_exec_balancer@parallel-ordering.html> (i915#4525<https://gitlab.freedesktop.org/drm/intel/issues/4525>) -> FAIL<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110375v1/shard-iclb1/igt@gem_exec_balancer@parallel-ordering.html> (i915#6117<https://gitlab.freedesktop.org/drm/intel/issues/6117>)
* igt@gem_pread@exhaustion:
* shard-apl: WARN<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12325/shard-apl7/igt@gem_pread@exhaustion.html> (i915#2658<https://gitlab.freedesktop.org/drm/intel/issues/2658>) -> INCOMPLETE<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110375v1/shard-apl7/igt@gem_pread@exhaustion.html> (i915#7248<https://gitlab.freedesktop.org/drm/intel/issues/7248>)
* shard-glk: INCOMPLETE<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12325/shard-glk3/igt@gem_pread@exhaustion.html> (i915#7248<https://gitlab.freedesktop.org/drm/intel/issues/7248>) -> WARN<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110375v1/shard-glk5/igt@gem_pread@exhaustion.html> (i915#2658<https://gitlab.freedesktop.org/drm/intel/issues/2658>)
* igt@kms_flip@flip-vs-expired-vblank@c-edp1:
* shard-skl: FAIL<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12325/shard-skl4/igt@kms_flip@flip-vs-expired-vblank@c-edp1.html> (i915#79<https://gitlab.freedesktop.org/drm/intel/issues/79>) -> FAIL<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110375v1/shard-skl4/igt@kms_flip@flip-vs-expired-vblank@c-edp1.html> (i915#2122<https://gitlab.freedesktop.org/drm/intel/issues/2122>)
* igt@kms_psr2_sf@cursor-plane-move-continuous-sf:
* shard-iclb: SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12325/shard-iclb2/igt@kms_psr2_sf@cursor-plane-move-continuous-sf.html> (i915#2920<https://gitlab.freedesktop.org/drm/intel/issues/2920>) -> SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110375v1/shard-iclb6/igt@kms_psr2_sf@cursor-plane-move-continuous-sf.html> (i915#658<https://gitlab.freedesktop.org/drm/intel/issues/658>)
* igt@runner@aborted:
* shard-apl: (FAIL<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12325/shard-apl7/igt@runner@aborted.html>, FAIL<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12325/shard-apl2/igt@runner@aborted.html>, FAIL<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12325/shard-apl6/igt@runner@aborted.html>, FAIL<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12325/shard-apl6/igt@runner@aborted.html>) (fdo#109271<https://bugs.freedesktop.org/show_bug.cgi?id=109271> / i915#3002<https://gitlab.freedesktop.org/drm/intel/issues/3002> / i915#4312<https://gitlab.freedesktop.org/drm/intel/issues/4312>) -> (FAIL<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110375v1/shard-apl8/igt@runner@aborted.html>, FAIL<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110375v1/shard-apl3/igt@runner@aborted.html>, FAIL<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110375v1/shard-apl6/igt@runner@aborted.html>, FAIL<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110375v1/shard-apl1/igt@runner@aborted.html>, FAIL<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110375v1/shard-apl6/igt@runner@aborted.html>) (i915#180<https://gitlab.freedesktop.org/drm/intel/issues/180> / i915#3002<https://gitlab.freedesktop.org/drm/intel/issues/3002> / i915#4312<https://gitlab.freedesktop.org/drm/intel/issues/4312>)
* shard-skl: (FAIL<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12325/shard-skl4/igt@runner@aborted.html>, FAIL<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12325/shard-skl10/igt@runner@aborted.html>) (i915#3002<https://gitlab.freedesktop.org/drm/intel/issues/3002> / i915#4312<https://gitlab.freedesktop.org/drm/intel/issues/4312>) -> (FAIL<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110375v1/shard-skl9/igt@runner@aborted.html>, FAIL<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110375v1/shard-skl1/igt@runner@aborted.html>, FAIL<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110375v1/shard-skl10/igt@runner@aborted.html>, FAIL<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110375v1/shard-skl7/igt@runner@aborted.html>, FAIL<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110375v1/shard-skl3/igt@runner@aborted.html>) (i915#3002<https://gitlab.freedesktop.org/drm/intel/issues/3002> / i915#4312<https://gitlab.freedesktop.org/drm/intel/issues/4312> / i915#6949<https://gitlab.freedesktop.org/drm/intel/issues/6949>)
Build changes
* Linux: CI_DRM_12325 -> Patchwork_110375v1
CI-20190529: 20190529
CI_DRM_12325: 1a90222aa5e5bb86ffcbde5ba9611659a23f0df6 @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_7032: 372c56225e12578a7a4a6bcc5b79eb40b643fcde @ https://gitlab.freedesktop.org/drm/igt-gpu-tools.git
Patchwork_110375v1: 1a90222aa5e5bb86ffcbde5ba9611659a23f0df6 @ git://anongit.freedesktop.org/gfx-ci/linux
piglit_4509: fdc5a4ca11124ab8413c7988896eec4c97336694 @ git://anongit.freedesktop.org/piglit
diff --git a/drivers/gpu/drm/i915/display/intel_psr.c b/drivers/gpu/drm/i915/display/intel_psr.c index 904a1049eff3..4bfb8313738e 100644 --- a/drivers/gpu/drm/i915/display/intel_psr.c +++ b/drivers/gpu/drm/i915/display/intel_psr.c @@ -1470,7 +1470,8 @@ void intel_psr_resume(struct intel_dp *intel_dp) 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; + return IS_ALDERLAKE_P(dev_priv) || DISPLAY_VER(dev_priv) >= 14 ? 0 : + PSR2_MAN_TRK_CTL_ENABLE; } static u32 man_trk_ctl_single_full_frame_bit_get(struct drm_i915_private *dev_priv) @@ -1482,14 +1483,14 @@ static u32 man_trk_ctl_single_full_frame_bit_get(struct drm_i915_private *dev_pr static u32 man_trk_ctl_partial_frame_bit_get(struct drm_i915_private *dev_priv) { - return IS_ALDERLAKE_P(dev_priv) ? + return IS_ALDERLAKE_P(dev_priv) || DISPLAY_VER(dev_priv) >= 14 ? ADLP_PSR2_MAN_TRK_CTL_SF_PARTIAL_FRAME_UPDATE : PSR2_MAN_TRK_CTL_SF_PARTIAL_FRAME_UPDATE; } static u32 man_trk_ctl_continuos_full_frame(struct drm_i915_private *dev_priv) { - return IS_ALDERLAKE_P(dev_priv) ? + return IS_ALDERLAKE_P(dev_priv) || DISPLAY_VER(dev_priv) >= 14 ? ADLP_PSR2_MAN_TRK_CTL_SF_CONTINUOS_FULL_FRAME : PSR2_MAN_TRK_CTL_SF_CONTINUOS_FULL_FRAME; }
MTL shares PSR2_MAN_TRK_CTL bits with ADL. Currently some bit getter functions are incorrect for MTL. This patch fixes those. Bspec: 49274 Cc: José Roberto de Souza <jose.souza@intel.com> Cc: Mika Kahola <mika.kahola@intel.com> Cc: Radhakrishna Sripada <radhakrishna.sripada@intel.com> Fixes: 47d4ae2192cb ("drm/i915/mtl: Extend PSR support") Signed-off-by: Jouni Högander <jouni.hogander@intel.com> --- drivers/gpu/drm/i915/display/intel_psr.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)