| Message ID | 20210209205036.351076-1-jose.souza@intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [v2] drm/i915/display: Allow PSR2 selective fetch to be enabled at run-time | expand |
On Tue, 2021-02-09 at 12:50 -0800, José Roberto de Souza wrote: > Right now CI is blacklisting module reload, so we need to be able to > enable PSR2 selective fetch in run time to test this feature before > enable it by default. > Changes in IGT will also be needed. > > v2: > - Fixed handling of I915_PSR_DEBUG_ENABLE_SEL_FETCH in > intel_psr_debug_set() > > Cc: Gwan-gyeong Mun <gwan-gyeong.mun@intel.com> > Signed-off-by: José Roberto de Souza <jose.souza@intel.com> > --- > drivers/gpu/drm/i915/display/intel_display_types.h | 1 + > drivers/gpu/drm/i915/display/intel_psr.c | 8 +++++--- > 2 files changed, 6 insertions(+), 3 deletions(-) > > diff --git a/drivers/gpu/drm/i915/display/intel_display_types.h > b/drivers/gpu/drm/i915/display/intel_display_types.h > index ebaa9d0ed376..577f47aa6b3e 100644 > --- a/drivers/gpu/drm/i915/display/intel_display_types.h > +++ b/drivers/gpu/drm/i915/display/intel_display_types.h > @@ -1425,6 +1425,7 @@ struct intel_psr { > #define I915_PSR_DEBUG_DISABLE 0x01 > #define I915_PSR_DEBUG_ENABLE 0x02 > #define I915_PSR_DEBUG_FORCE_PSR1 0x03 > +#define I915_PSR_DEBUG_ENABLE_SEL_FETCH 0x4 > #define I915_PSR_DEBUG_IRQ 0x10 > > u32 debug; > diff --git a/drivers/gpu/drm/i915/display/intel_psr.c > b/drivers/gpu/drm/i915/display/intel_psr.c > index bf214d0e2dec..43e9e362382b 100644 > --- a/drivers/gpu/drm/i915/display/intel_psr.c > +++ b/drivers/gpu/drm/i915/display/intel_psr.c > @@ -684,7 +684,8 @@ static bool > intel_psr2_sel_fetch_config_valid(struct intel_dp *intel_dp, > struct intel_plane *plane; > int i; > > - if (!dev_priv->params.enable_psr2_sel_fetch) { > + if (!dev_priv->params.enable_psr2_sel_fetch && > + intel_dp->psr.debug != I915_PSR_DEBUG_ENABLE_SEL_FETCH) { > drm_dbg_kms(&dev_priv->drm, > "PSR2 sel fetch not enabled, disabled by > parameter\n"); > return false; > @@ -1448,7 +1449,8 @@ void intel_psr_update(struct intel_dp > *intel_dp, > enable = crtc_state->has_psr; > psr2_enable = crtc_state->has_psr2; > > - if (enable == psr->enabled && psr2_enable == psr- > >psr2_enabled) { > + if (enable == psr->enabled && psr2_enable == psr- > >psr2_enabled && > + crtc_state->enable_psr2_sel_fetch == psr- > >psr2_sel_fetch_enabled) { > /* Force a PSR exit when enabling CRC to avoid CRC > timeouts */ > if (crtc_state->crc_enabled && psr->enabled) > psr_force_hw_tracking_exit(intel_dp); > @@ -1637,7 +1639,7 @@ int intel_psr_debug_set(struct intel_dp > *intel_dp, u64 val) > int ret; > > if (val & ~(I915_PSR_DEBUG_IRQ | I915_PSR_DEBUG_MODE_MASK) || > - mode > I915_PSR_DEBUG_FORCE_PSR1) { > + mode > I915_PSR_DEBUG_ENABLE_SEL_FETCH) { > drm_dbg_kms(&dev_priv->drm, "Invalid debug mask > %llx\n", val); > return -EINVAL; > } Looks good to me. Reviewed-by: Gwan-gyeong Mun <gwan-gyeong.mun@intel.com>
On Wed, 2021-02-10 at 00:27 +0000, Patchwork wrote:
Patch Details
Series: drm/i915/display: Allow PSR2 selective fetch to be enabled at run-time (rev2)
URL: https://patchwork.freedesktop.org/series/86773/
State: failure
Details: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19645/index.html
CI Bug Log - changes from CI_DRM_9752_full -> Patchwork_19645_full
Summary
FAILURE
Serious unknown changes coming with Patchwork_19645_full absolutely need to be
verified manually.
If you think the reported changes have nothing to do with the changes
introduced in Patchwork_19645_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_19645_full:
IGT changes
Possible regressions
* igt@gem_exec_capture@capture@bcs0:
* shard-skl: PASS<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9752/shard-skl5/igt@gem_exec_capture@capture@bcs0.html> -> FAIL<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19645/shard-skl2/igt@gem_exec_capture@capture@bcs0.html>
Not related.
Patch pushed thanks for the review GG.
Known issues
Here are the changes found in Patchwork_19645_full that come from known issues:
IGT changes
Issues hit
* igt@gem_eio@unwedge-stress:
* shard-tglb: PASS<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9752/shard-tglb8/igt@gem_eio@unwedge-stress.html> -> TIMEOUT<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19645/shard-tglb6/igt@gem_eio@unwedge-stress.html> ([i915#1037] / [i915#3063])
* shard-iclb: PASS<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9752/shard-iclb8/igt@gem_eio@unwedge-stress.html> -> TIMEOUT<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19645/shard-iclb6/igt@gem_eio@unwedge-stress.html> ([i915#1037] / [i915#2481])
* igt@gem_exec_balancer@hang:
* shard-iclb: PASS<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9752/shard-iclb3/igt@gem_exec_balancer@hang.html> -> INCOMPLETE<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19645/shard-iclb4/igt@gem_exec_balancer@hang.html> ([i915#1895] / [i915#2295])
* igt@gem_exec_fair@basic-flow@rcs0:
* shard-tglb: PASS<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9752/shard-tglb7/igt@gem_exec_fair@basic-flow@rcs0.html> -> FAIL<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19645/shard-tglb3/igt@gem_exec_fair@basic-flow@rcs0.html> ([i915#2842])
* igt@gem_exec_fair@basic-none-solo@rcs0:
* shard-kbl: PASS<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9752/shard-kbl2/igt@gem_exec_fair@basic-none-solo@rcs0.html> -> FAIL<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19645/shard-kbl3/igt@gem_exec_fair@basic-none-solo@rcs0.html> ([i915#2842]) +1 similar issue
* igt@gem_exec_fair@basic-pace@vcs0:
* shard-glk: PASS<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9752/shard-glk6/igt@gem_exec_fair@basic-pace@vcs0.html> -> FAIL<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19645/shard-glk7/igt@gem_exec_fair@basic-pace@vcs0.html> ([i915#2842])
* igt@gem_exec_fair@basic-sync@rcs0:
* shard-kbl: PASS<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9752/shard-kbl1/igt@gem_exec_fair@basic-sync@rcs0.html> -> SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19645/shard-kbl4/igt@gem_exec_fair@basic-sync@rcs0.html> ([fdo#109271])
* igt@gem_exec_reloc@basic-wide-active@rcs0:
* shard-kbl: NOTRUN -> FAIL<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19645/shard-kbl7/igt@gem_exec_reloc@basic-wide-active@rcs0.html> ([i915#2389]) +4 similar issues
* igt@gem_exec_reloc@basic-wide-active@vcs1:
* shard-iclb: NOTRUN -> FAIL<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19645/shard-iclb1/igt@gem_exec_reloc@basic-wide-active@vcs1.html> ([i915#2389])
* igt@gem_exec_schedule@u-fairslice@bcs0:
* shard-iclb: PASS<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9752/shard-iclb3/igt@gem_exec_schedule@u-fairslice@bcs0.html> -> DMESG-WARN<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19645/shard-iclb7/igt@gem_exec_schedule@u-fairslice@bcs0.html> ([i915#2803])
* igt@gem_exec_schedule@u-fairslice@rcs0:
* shard-skl: PASS<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9752/shard-skl4/igt@gem_exec_schedule@u-fairslice@rcs0.html> -> DMESG-WARN<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19645/shard-skl9/igt@gem_exec_schedule@u-fairslice@rcs0.html> ([i915#1610] / [i915#2803])
* igt@gem_exec_schedule@u-fairslice@vcs0:
* shard-glk: PASS<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9752/shard-glk7/igt@gem_exec_schedule@u-fairslice@vcs0.html> -> DMESG-WARN<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19645/shard-glk5/igt@gem_exec_schedule@u-fairslice@vcs0.html> ([i915#1610] / [i915#2803])
* igt@gem_exec_whisper@basic-fds:
* shard-glk: PASS<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9752/shard-glk9/igt@gem_exec_whisper@basic-fds.html> -> DMESG-WARN<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19645/shard-glk9/igt@gem_exec_whisper@basic-fds.html> ([i915#118] / [i915#95])
* igt@gem_huc_copy@huc-copy:
* shard-apl: NOTRUN -> SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19645/shard-apl7/igt@gem_huc_copy@huc-copy.html> ([fdo#109271] / [i915#2190])
* igt@gem_pread@exhaustion:
* shard-kbl: NOTRUN -> WARN<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19645/shard-kbl3/igt@gem_pread@exhaustion.html> ([i915#2658])
* igt@gem_userptr_blits@mmap-offset-invalidate-active@wb:
* shard-kbl: NOTRUN -> SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19645/shard-kbl1/igt@gem_userptr_blits@mmap-offset-invalidate-active@wb.html> ([fdo#109271]) +56 similar issues
* igt@gem_userptr_blits@process-exit-mmap-busy@wc:
* shard-apl: NOTRUN -> SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19645/shard-apl7/igt@gem_userptr_blits@process-exit-mmap-busy@wc.html> ([fdo#109271] / [i915#1699]) +3 similar issues
* igt@i915_pm_dc@dc3co-vpb-simulation:
* shard-kbl: NOTRUN -> SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19645/shard-kbl1/igt@i915_pm_dc@dc3co-vpb-simulation.html> ([fdo#109271] / [i915#658])
* igt@i915_pm_lpsp@kms-lpsp@kms-lpsp-dp:
* shard-apl: NOTRUN -> SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19645/shard-apl7/igt@i915_pm_lpsp@kms-lpsp@kms-lpsp-dp.html> ([fdo#109271] / [i915#1937])
* igt@i915_suspend@fence-restore-tiled2untiled:
* shard-apl: PASS<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9752/shard-apl4/igt@i915_suspend@fence-restore-tiled2untiled.html> -> DMESG-WARN<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19645/shard-apl2/igt@i915_suspend@fence-restore-tiled2untiled.html> ([i915#180]) +2 similar issues
* igt@i915_suspend@sysfs-reader:
* shard-kbl: PASS<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9752/shard-kbl6/igt@i915_suspend@sysfs-reader.html> -> DMESG-WARN<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19645/shard-kbl7/igt@i915_suspend@sysfs-reader.html> ([i915#180]) +2 similar issues
* igt@kms_async_flips@alternate-sync-async-flip:
* shard-snb: PASS<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9752/shard-snb6/igt@kms_async_flips@alternate-sync-async-flip.html> -> FAIL<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19645/shard-snb6/igt@kms_async_flips@alternate-sync-async-flip.html> ([i915#2521])
* igt@kms_big_joiner@invalid-modeset:
* shard-kbl: NOTRUN -> SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19645/shard-kbl1/igt@kms_big_joiner@invalid-modeset.html> ([fdo#109271] / [i915#2705])
* igt@kms_chamelium@hdmi-audio:
* shard-skl: NOTRUN -> SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19645/shard-skl7/igt@kms_chamelium@hdmi-audio.html> ([fdo#109271] / [fdo#111827]) +2 similar issues
* igt@kms_chamelium@hdmi-hpd-storm-disable:
* shard-kbl: NOTRUN -> SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19645/shard-kbl1/igt@kms_chamelium@hdmi-hpd-storm-disable.html> ([fdo#109271] / [fdo#111827]) +6 similar issues
* igt@kms_chamelium@vga-hpd:
* shard-apl: NOTRUN -> SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19645/shard-apl7/igt@kms_chamelium@vga-hpd.html> ([fdo#109271] / [fdo#111827]) +5 similar issues
* igt@kms_content_protection@lic:
* shard-kbl: NOTRUN -> TIMEOUT<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19645/shard-kbl1/igt@kms_content_protection@lic.html> ([i915#1319])
* igt@kms_cursor_crc@pipe-b-cursor-256x85-random:
* shard-skl: PASS<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9752/shard-skl6/igt@kms_cursor_crc@pipe-b-cursor-256x85-random.html> -> FAIL<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19645/shard-skl1/igt@kms_cursor_crc@pipe-b-cursor-256x85-random.html> ([i915#54]) +7 similar issues
* igt@kms_cursor_crc@pipe-b-cursor-64x21-random:
* shard-skl: NOTRUN -> FAIL<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19645/shard-skl5/igt@kms_cursor_crc@pipe-b-cursor-64x21-random.html> ([i915#54]) +1 similar issue
* igt@kms_cursor_legacy@flip-vs-cursor-legacy:
* shard-skl: PASS<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9752/shard-skl4/igt@kms_cursor_legacy@flip-vs-cursor-legacy.html> -> FAIL<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19645/shard-skl9/igt@kms_cursor_legacy@flip-vs-cursor-legacy.html> ([i915#2346])
* igt@kms_flip@2x-flip-vs-expired-vblank@ab-hdmi-a1-hdmi-a2:
* shard-glk: PASS<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9752/shard-glk6/igt@kms_flip@2x-flip-vs-expired-vblank@ab-hdmi-a1-hdmi-a2.html> -> FAIL<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19645/shard-glk7/igt@kms_flip@2x-flip-vs-expired-vblank@ab-hdmi-a1-hdmi-a2.html> ([i915#2122])
* igt@kms_flip@flip-vs-expired-vblank-interruptible@c-edp1:
* shard-skl: PASS<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9752/shard-skl7/igt@kms_flip@flip-vs-expired-vblank-interruptible@c-edp1.html> -> FAIL<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19645/shard-skl6/igt@kms_flip@flip-vs-expired-vblank-interruptible@c-edp1.html> ([i915#79])
* igt@kms_flip@plain-flip-fb-recreate-interruptible@c-edp1:
* shard-skl: PASS<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9752/shard-skl10/igt@kms_flip@plain-flip-fb-recreate-interruptible@c-edp1.html> -> FAIL<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19645/shard-skl3/igt@kms_flip@plain-flip-fb-recreate-interruptible@c-edp1.html> ([i915#2122]) +2 similar issues
* igt@kms_flip_scaled_crc@flip-32bpp-ytile-to-32bpp-ytileccs:
* shard-apl: NOTRUN -> FAIL<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19645/shard-apl7/igt@kms_flip_scaled_crc@flip-32bpp-ytile-to-32bpp-ytileccs.html> ([i915#2641])
* igt@kms_flip_scaled_crc@flip-32bpp-ytile-to-32bpp-ytilegen12rcccs:
* shard-kbl: NOTRUN -> SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19645/shard-kbl1/igt@kms_flip_scaled_crc@flip-32bpp-ytile-to-32bpp-ytilegen12rcccs.html> ([fdo#109271] / [i915#2672])
* igt@kms_flip_scaled_crc@flip-64bpp-ytile-to-16bpp-ytile:
* shard-skl: NOTRUN -> FAIL<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19645/shard-skl5/igt@kms_flip_scaled_crc@flip-64bpp-ytile-to-16bpp-ytile.html> ([i915#2628])
* igt@kms_frontbuffer_tracking@fbc-1p-primscrn-cur-indfb-draw-mmap-wc:
* shard-kbl: PASS<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9752/shard-kbl1/igt@kms_frontbuffer_tracking@fbc-1p-primscrn-cur-indfb-draw-mmap-wc.html> -> FAIL<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19645/shard-kbl6/igt@kms_frontbuffer_tracking@fbc-1p-primscrn-cur-indfb-draw-mmap-wc.html> ([i915#49])
* shard-apl: PASS<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9752/shard-apl4/igt@kms_frontbuffer_tracking@fbc-1p-primscrn-cur-indfb-draw-mmap-wc.html> -> FAIL<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19645/shard-apl8/igt@kms_frontbuffer_tracking@fbc-1p-primscrn-cur-indfb-draw-mmap-wc.html> ([i915#49])
* igt@kms_frontbuffer_tracking@fbcpsr-2p-indfb-fliptrack:
* shard-skl: NOTRUN -> SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19645/shard-skl4/igt@kms_frontbuffer_tracking@fbcpsr-2p-indfb-fliptrack.html> ([fdo#109271]) +40 similar issues
* igt@kms_hdr@bpc-switch:
* shard-skl: PASS<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9752/shard-skl6/igt@kms_hdr@bpc-switch.html> -> FAIL<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19645/shard-skl8/igt@kms_hdr@bpc-switch.html> ([i915#1188])
* igt@kms_pipe_crc_basic@read-crc-pipe-d:
* shard-skl: NOTRUN -> SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19645/shard-skl7/igt@kms_pipe_crc_basic@read-crc-pipe-d.html> ([fdo#109271] / [i915#533]) +1 similar issue
* igt@kms_plane_alpha_blend@pipe-b-alpha-opaque-fb:
* shard-skl: NOTRUN -> FAIL<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19645/shard-skl9/igt@kms_plane_alpha_blend@pipe-b-alpha-opaque-fb.html> ([fdo#108145] / [i915#265])
* igt@kms_plane_alpha_blend@pipe-b-alpha-transparent-fb:
* shard-kbl: NOTRUN -> FAIL<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19645/shard-kbl1/igt@kms_plane_alpha_blend@pipe-b-alpha-transparent-fb.html> ([i915#265])
* igt@kms_psr2_sf@primary-plane-update-sf-dmg-area-5:
* shard-apl: NOTRUN -> SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19645/shard-apl7/igt@kms_psr2_sf@primary-plane-update-sf-dmg-area-5.html> ([fdo#109271] / [i915#658]) +1 similar issue
* igt@kms_psr2_su@frontbuffer:
* shard-skl: NOTRUN -> SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19645/shard-skl7/igt@kms_psr2_su@frontbuffer.html> ([fdo#109271] / [i915#658])
* igt@kms_psr@psr2_basic:
* shard-iclb: PASS<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9752/shard-iclb2/igt@kms_psr@psr2_basic.html> -> SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19645/shard-iclb8/igt@kms_psr@psr2_basic.html> ([fdo#109441]) +1 similar issue
* igt@kms_vblank@pipe-d-wait-forked-hang:
* shard-apl: NOTRUN -> SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19645/shard-apl8/igt@kms_vblank@pipe-d-wait-forked-hang.html> ([fdo#109271]) +49 similar issues
* igt@kms_writeback@writeback-fb-id:
* shard-apl: NOTRUN -> SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19645/shard-apl7/igt@kms_writeback@writeback-fb-id.html> ([fdo#109271] / [i915#2437])
* igt@sysfs_clients@sema-25@vecs0:
* shard-skl: PASS<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9752/shard-skl4/igt@sysfs_clients@sema-25@vecs0.html> -> SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19645/shard-skl9/igt@sysfs_clients@sema-25@vecs0.html> ([fdo#109271])
* igt@sysfs_clients@split-10@vcs0:
* shard-skl: PASS<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9752/shard-skl10/igt@sysfs_clients@split-10@vcs0.html> -> SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19645/shard-skl3/igt@sysfs_clients@split-10@vcs0.html> ([fdo#109271] / [i915#3026])
Possible fixes
* igt@gem_ctx_isolation@preservation-s3@bcs0:
* shard-apl: DMESG-WARN<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9752/shard-apl1/igt@gem_ctx_isolation@preservation-s3@bcs0.html> ([i915#180]) -> PASS<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19645/shard-apl8/igt@gem_ctx_isolation@preservation-s3@bcs0.html> +4 similar issues
* igt@gem_ctx_isolation@preservation-s3@vcs0:
* shard-kbl: DMESG-WARN<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9752/shard-kbl7/igt@gem_ctx_isolation@preservation-s3@vcs0.html> ([i915#180]) -> PASS<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19645/shard-kbl1/igt@gem_ctx_isolation@preservation-s3@vcs0.html> +3 similar issues
* igt@gem_eio@in-flight-contexts-immediate:
* shard-tglb: TIMEOUT<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9752/shard-tglb5/igt@gem_eio@in-flight-contexts-immediate.html> -> PASS<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19645/shard-tglb5/igt@gem_eio@in-flight-contexts-immediate.html>
* igt@gem_exec_fair@basic-none-share@rcs0:
* shard-tglb: FAIL<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9752/shard-tglb1/igt@gem_exec_fair@basic-none-share@rcs0.html> ([i915#2842]) -> PASS<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19645/shard-tglb7/igt@gem_exec_fair@basic-none-share@rcs0.html>
* igt@gem_exec_fair@basic-pace@vcs1:
* shard-kbl: SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9752/shard-kbl3/igt@gem_exec_fair@basic-pace@vcs1.html> ([fdo#109271]) -> PASS<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19645/shard-kbl1/igt@gem_exec_fair@basic-pace@vcs1.html>
* igt@kms_async_flips@test-time-stamp:
* shard-tglb: FAIL<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9752/shard-tglb1/igt@kms_async_flips@test-time-stamp.html> ([i915#2597]) -> PASS<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19645/shard-tglb1/igt@kms_async_flips@test-time-stamp.html>
* igt@kms_cursor_crc@pipe-a-cursor-64x21-random:
* shard-skl: FAIL<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9752/shard-skl5/igt@kms_cursor_crc@pipe-a-cursor-64x21-random.html> ([i915#54]) -> PASS<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19645/shard-skl2/igt@kms_cursor_crc@pipe-a-cursor-64x21-random.html> +8 similar issues
* igt@kms_cursor_legacy@flip-vs-cursor-atomic-transitions:
* shard-skl: FAIL<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9752/shard-skl1/igt@kms_cursor_legacy@flip-vs-cursor-atomic-transitions.html> ([i915#2346]) -> PASS<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19645/shard-skl6/igt@kms_cursor_legacy@flip-vs-cursor-atomic-transitions.html>
* igt@kms_flip@flip-vs-expired-vblank-interruptible@a-dp1:
* shard-apl: FAIL<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9752/shard-apl8/igt@kms_flip@flip-vs-expired-vblank-interruptible@a-dp1.html> ([i915#2122]) -> PASS<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19645/shard-apl3/igt@kms_flip@flip-vs-expired-vblank-interruptible@a-dp1.html>
* igt@kms_flip@flip-vs-expired-vblank-interruptible@a-edp1:
* shard-tglb: FAIL<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9752/shard-tglb1/igt@kms_flip@flip-vs-expired-vblank-interruptible@a-edp1.html> ([i915#2598]) -> PASS<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19645/shard-tglb7/igt@kms_flip@flip-vs-expired-vblank-interruptible@a-edp1.html>
* igt@kms_flip@flip-vs-suspend@a-vga1:
* shard-snb: DMESG-WARN<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9752/shard-snb2/igt@kms_flip@flip-vs-suspend@a-vga1.html> ([i915#2772] / [i915#42]) -> PASS<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19645/shard-snb2/igt@kms_flip@flip-vs-suspend@a-vga1.html>
* igt@kms_plane@plane-panning-bottom-right-suspend-pipe-a-planes:
* shard-kbl: DMESG-WARN<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9752/shard-kbl1/igt@kms_plane@plane-panning-bottom-right-suspend-pipe-a-planes.html> ([i915#180] / [i915#533]) -> PASS<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19645/shard-kbl7/igt@kms_plane@plane-panning-bottom-right-suspend-pipe-a-planes.html>
* igt@kms_plane_alpha_blend@pipe-b-coverage-7efc:
* shard-skl: FAIL<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9752/shard-skl4/igt@kms_plane_alpha_blend@pipe-b-coverage-7efc.html> ([fdo#108145] / [i915#265]) -> PASS<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19645/shard-skl9/igt@kms_plane_alpha_blend@pipe-b-coverage-7efc.html>
* igt@kms_psr2_su@page_flip:
* shard-iclb: SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9752/shard-iclb6/igt@kms_psr2_su@page_flip.html> ([fdo#109642] / [fdo#111068] / [i915#658]) -> PASS<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19645/shard-iclb2/igt@kms_psr2_su@page_flip.html>
* igt@kms_psr@psr2_sprite_mmap_cpu:
* shard-iclb: SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9752/shard-iclb8/igt@kms_psr@psr2_sprite_mmap_cpu.html> ([fdo#109441]) -> PASS<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19645/shard-iclb2/igt@kms_psr@psr2_sprite_mmap_cpu.html>
* igt@kms_vblank@pipe-a-accuracy-idle:
* shard-skl: DMESG-WARN<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9752/shard-skl9/igt@kms_vblank@pipe-a-accuracy-idle.html> ([i915#1982]) -> PASS<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19645/shard-skl5/igt@kms_vblank@pipe-a-accuracy-idle.html>
* {igt@sysfs_clients@recycle-many}:
* shard-glk: FAIL<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9752/shard-glk9/igt@sysfs_clients@recycle-many.html> ([i915#3028]) -> PASS<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19645/shard-glk9/igt@sysfs_clients@recycle-many.html>
Warnings
* igt@i915_pm_rc6_residency@rc6-fence:
* shard-iclb: WARN<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9752/shard-iclb6/igt@i915_pm_rc6_residency@rc6-fence.html> ([i915#1804] / [i915#2684]) -> WARN<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19645/shard-iclb8/igt@i915_pm_rc6_residency@rc6-fence.html> ([i915#2681] / [i915#2684])
* igt@i915_pm_rc6_residency@rc6-idle:
* shard-iclb: WARN<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9752/shard-iclb4/igt@i915_pm_rc6_residency@rc6-idle.html> ([i915#1804] / [i915#2684]) -> WARN<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19645/shard-iclb5/igt@i915_pm_rc6_residency@rc6-idle.html> ([i915#2684])
* igt@kms_async_flips@alternate-sync-async-flip:
* shard-skl: DMESG-FAIL<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9752/shard-skl9/igt@kms_async_flips@alternate-sync-async-flip.html> -> FAIL<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19645/shard-skl5/igt@kms_async_flips@alternate-sync-async-flip.html> ([i915#2521])
* igt@kms_psr2_sf@overlay-primary-update-sf-dmg-area-1:
* shard-iclb: SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9752/shard-iclb2/igt@kms_psr2_sf@overlay-primary-update-sf-dmg-area-1.html> ([i915#2920]) -> SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19645/shard-iclb8/igt@kms_psr2_sf@overlay-primary-update-sf-dmg-area-1.html> ([i915#658])
* igt@kms_psr2_sf@overlay-primary-update-sf-dmg-area-3:
* shard-iclb: SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9752/shard-iclb8/igt@kms_psr2_sf@overlay-primary-update-sf-dmg-area-3.html> ([i915#658]) -> SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19645/shard-iclb2/igt@kms_psr2_sf@overlay-primary-update-sf-dmg-area-3.html> ([i915#2920]) +1 similar issue
* igt@runner@aborted:
* shard-kbl: (FAIL<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9752/shard-kbl7/igt@runner@aborted.html>, FAIL<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9752/shard-kbl7/igt@runner@aborted.html>, FAIL<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9752/shard-kbl2/igt@runner@aborted.html>, FAIL<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9752/shard-kbl7/igt@runner@aborted.html>, FAIL<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9752/shard-kbl6/igt@runner@aborted.html>, FAIL<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9752/shard-kbl3/igt@runner@aborted.html>, FAIL<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9752/shard-kbl1/igt@runner@aborted.html>) ([i915#1436] / [i915#1814] / [i915#2295] / [i915#2505] / [i915#3002]) -> (FAIL<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19645/shard-kbl3/igt@runner@aborted.html>, FAIL<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19645/shard-kbl3/igt@runner@aborted.html>, FAIL<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19645/shard-kbl7/igt@runner@aborted.html>, FAIL<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19645/shard-kbl7/igt@runner@aborted.html>, FAIL<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19645/shard-kbl7/igt@runner@aborted.html>) ([i915#2295] / [i915#3002])
* shard-iclb: (FAIL<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9752/shard-iclb6/igt@runner@aborted.html>, FAIL<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9752/shard-iclb3/igt@runner@aborted.html>, FAIL<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9752/shard-iclb4/igt@runner@aborted.html>) ([i915#2295] / [i915#2724] / [i915#3002]) -> (FAIL<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19645/shard-iclb7/igt@runner@aborted.html>, FAIL<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19645/shard-iclb5/igt@runner@aborted.html>, FAIL<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19645/shard-iclb2/igt@runner@aborted.html>) ([i915#2295] / [i915#2426] / [i915#2724] / [i915#3002])
* shard-apl: (FAIL<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9752/shard-apl1/igt@runner@aborted.html>, FAIL<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9752/shard-apl3/igt@runner@aborted.html>, FAIL<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9752/shard-apl7/igt@runner@aborted.html>, FAIL<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9752/shard-apl4/igt@runner@aborted.html>, FAIL<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9752/shard-apl3/igt@runner@aborted.html>, FAIL<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9752/shard-apl3/igt@runner@aborted.html>, FAIL<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9752/shard-apl3/igt@runner@aborted.html>) ([i915#1610] / [i915#2292] / [i915#2295] / [i915#3002]) -> (FAIL<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19645/shard-apl2/igt@runner@aborted.html>, FAIL<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19645/shard-apl7/igt@runner@aborted.html>, FAIL<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19645/shard-apl6/igt@runner@aborted.html>, FAIL<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19645/shard-apl7/igt@runner@aborted.html>, FAIL<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19645/shard-apl4/igt@runner@aborted.html>, FAIL<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19645/shard-apl6/igt@runner@aborted.html>, FAIL<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19645/shard-apl8/igt@runner@aborted.html>) ([fdo#109271] / [i915#2295] / [i915#3002])
* shard-glk: (FAIL<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9752/shard-glk9/igt@runner@aborted.html>, FAIL<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9752/shard-glk7/igt@runner@aborted.html>, FAIL<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9752/shard-glk9/igt@runner@aborted.html>) ([i915#2295] / [i915#3002] / [k.org#202321]) -> (FAIL<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19645/shard-glk2/igt@runner@aborted.html>, FAIL<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19645/shard-glk1/igt@runner@aborted.html>, FAIL<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19645/shard-glk5/igt@runner@aborted.html>, FAIL<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19645/shard-glk5/igt@runner@aborted.html>) ([i915#2295] / [i915#2426] / [i915#3002] / [k.org#202321])
* shard-skl: (FAIL<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9752/shard-skl1/igt@runner@aborted.html>, FAIL<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9752/shard-skl9/igt@runner@aborted.html>, FAIL<https://intel-gfx-ci.01.org/tree/drm-tip/C>, [FAIL][164]) ([i915#2295] / [i915#3002]) -> ([FAIL][165], [FAIL][166], [FAIL][167], [FAIL][168]) ([i915#2295] / [i915#2426] / [i915#3002])
diff --git a/drivers/gpu/drm/i915/display/intel_display_types.h b/drivers/gpu/drm/i915/display/intel_display_types.h index ebaa9d0ed376..577f47aa6b3e 100644 --- a/drivers/gpu/drm/i915/display/intel_display_types.h +++ b/drivers/gpu/drm/i915/display/intel_display_types.h @@ -1425,6 +1425,7 @@ struct intel_psr { #define I915_PSR_DEBUG_DISABLE 0x01 #define I915_PSR_DEBUG_ENABLE 0x02 #define I915_PSR_DEBUG_FORCE_PSR1 0x03 +#define I915_PSR_DEBUG_ENABLE_SEL_FETCH 0x4 #define I915_PSR_DEBUG_IRQ 0x10 u32 debug; diff --git a/drivers/gpu/drm/i915/display/intel_psr.c b/drivers/gpu/drm/i915/display/intel_psr.c index bf214d0e2dec..43e9e362382b 100644 --- a/drivers/gpu/drm/i915/display/intel_psr.c +++ b/drivers/gpu/drm/i915/display/intel_psr.c @@ -684,7 +684,8 @@ static bool intel_psr2_sel_fetch_config_valid(struct intel_dp *intel_dp, struct intel_plane *plane; int i; - if (!dev_priv->params.enable_psr2_sel_fetch) { + if (!dev_priv->params.enable_psr2_sel_fetch && + intel_dp->psr.debug != I915_PSR_DEBUG_ENABLE_SEL_FETCH) { drm_dbg_kms(&dev_priv->drm, "PSR2 sel fetch not enabled, disabled by parameter\n"); return false; @@ -1448,7 +1449,8 @@ void intel_psr_update(struct intel_dp *intel_dp, enable = crtc_state->has_psr; psr2_enable = crtc_state->has_psr2; - if (enable == psr->enabled && psr2_enable == psr->psr2_enabled) { + if (enable == psr->enabled && psr2_enable == psr->psr2_enabled && + crtc_state->enable_psr2_sel_fetch == psr->psr2_sel_fetch_enabled) { /* Force a PSR exit when enabling CRC to avoid CRC timeouts */ if (crtc_state->crc_enabled && psr->enabled) psr_force_hw_tracking_exit(intel_dp); @@ -1637,7 +1639,7 @@ int intel_psr_debug_set(struct intel_dp *intel_dp, u64 val) int ret; if (val & ~(I915_PSR_DEBUG_IRQ | I915_PSR_DEBUG_MODE_MASK) || - mode > I915_PSR_DEBUG_FORCE_PSR1) { + mode > I915_PSR_DEBUG_ENABLE_SEL_FETCH) { drm_dbg_kms(&dev_priv->drm, "Invalid debug mask %llx\n", val); return -EINVAL; }
Right now CI is blacklisting module reload, so we need to be able to enable PSR2 selective fetch in run time to test this feature before enable it by default. Changes in IGT will also be needed. v2: - Fixed handling of I915_PSR_DEBUG_ENABLE_SEL_FETCH in intel_psr_debug_set() Cc: Gwan-gyeong Mun <gwan-gyeong.mun@intel.com> Signed-off-by: José Roberto de Souza <jose.souza@intel.com> --- drivers/gpu/drm/i915/display/intel_display_types.h | 1 + drivers/gpu/drm/i915/display/intel_psr.c | 8 +++++--- 2 files changed, 6 insertions(+), 3 deletions(-)