| Message ID | 20210514232247.144542-1-jose.souza@intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [v2,1/4] drm/i915/display: Fix fastsets involving PSR | expand |
Reviewed-by: Gwan-gyeong Mun <gwan-gyeong.mun@intel.com> On 5/15/21 2:22 AM, José Roberto de Souza wrote: > Commit 78b772e1a01f ("drm/i915/display: Fill PSR state during hardware > configuration read out") is not allowing fastsets to happen when PSR > states changes but PSR is a feature that can be enabled and disabled > during fastsets. > > So here moving the PSR pipe conf checks to a block that is only > executed when checking if HW state matches with requested state, not > during the phase where it checks if fastset is possible or not. > > There still a state mismatch not allowing fastsets between states > turning off or on PSR because of crtc_state->infoframes.enable > BIT(DP_SDP_VSC) but at least for now it will allow a fastset between > PSR1 <-> PSR2, that is a case heavilly used by CI due to pipe CRC not > work with PSR2, but the remaning issue will be fixed in a future patch. > > Cc: Gwan-gyeong Mun <gwan-gyeong.mun@intel.com> > Cc: Radhakrishna Sripada <radhakrishna.sripada@intel.com> > Reported-by: Ville Syrjälä <ville.syrjala@linux.intel.com> > Fixes: 78b772e1a01f ("drm/i915/display: Fill PSR state during hardware configuration read out") > Signed-off-by: José Roberto de Souza <jose.souza@intel.com> > --- > drivers/gpu/drm/i915/display/intel_display.c | 10 +++++----- > 1 file changed, 5 insertions(+), 5 deletions(-) > > diff --git a/drivers/gpu/drm/i915/display/intel_display.c b/drivers/gpu/drm/i915/display/intel_display.c > index 0c2b194006f8..51f499271cc8 100644 > --- a/drivers/gpu/drm/i915/display/intel_display.c > +++ b/drivers/gpu/drm/i915/display/intel_display.c > @@ -8548,6 +8548,11 @@ intel_pipe_config_compare(const struct intel_crtc_state *current_config, > bp_gamma = intel_color_get_gamma_bit_precision(pipe_config); > if (bp_gamma) > PIPE_CONF_CHECK_COLOR_LUT(gamma_mode, hw.gamma_lut, bp_gamma); > + > + PIPE_CONF_CHECK_BOOL(has_psr); > + PIPE_CONF_CHECK_BOOL(has_psr2); > + PIPE_CONF_CHECK_BOOL(enable_psr2_sel_fetch); > + PIPE_CONF_CHECK_I(dc3co_exitline); > } > > PIPE_CONF_CHECK_BOOL(double_wide); > @@ -8631,11 +8636,6 @@ intel_pipe_config_compare(const struct intel_crtc_state *current_config, > PIPE_CONF_CHECK_I(vrr.flipline); > PIPE_CONF_CHECK_I(vrr.pipeline_full); > > - PIPE_CONF_CHECK_BOOL(has_psr); > - PIPE_CONF_CHECK_BOOL(has_psr2); > - PIPE_CONF_CHECK_BOOL(enable_psr2_sel_fetch); > - PIPE_CONF_CHECK_I(dc3co_exitline); > - > #undef PIPE_CONF_CHECK_X > #undef PIPE_CONF_CHECK_I > #undef PIPE_CONF_CHECK_BOOL >
On Sat, 2021-05-15 at 13:15 +0000, Patchwork wrote:
Patch Details
Series: series starting with [v2,1/4] drm/i915/display: Fix fastsets involving PSR (rev2)
URL: https://patchwork.freedesktop.org/series/90184/
State: failure
Details: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20131/index.html
CI Bug Log - changes from CI_DRM_10085_full -> Patchwork_20131_full
Summary
FAILURE
Serious unknown changes coming with Patchwork_20131_full absolutely need to be
verified manually.
If you think the reported changes have nothing to do with the changes
introduced in Patchwork_20131_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_20131_full:
IGT changes
Possible regressions
* igt@api_intel_bb@intel-bb-blit-none:
* shard-glk: PASS<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10085/shard-glk7/igt@api_intel_bb@intel-bb-blit-none.html> -> FAIL<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20131/shard-glk9/igt@api_intel_bb@intel-bb-blit-none.html>
* igt@kms_plane_cursor@pipe-a-viewport-size-128:
* shard-snb: NOTRUN -> FAIL<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20131/shard-snb2/igt@kms_plane_cursor@pipe-a-viewport-size-128.html> +1 similar issue
Both are not related, the changes are related to display and snb don't support PSR.
Pushed the 3 patches reviewed, will follow up the other one latter.
Thanks for the reviews GG.
Warnings
* igt@gem_mmap_gtt@fault-concurrent-x:
* shard-glk: INCOMPLETE<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10085/shard-glk3/igt@gem_mmap_gtt@fault-concurrent-x.html> ([i915#3468]) -> INCOMPLETE<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20131/shard-glk8/igt@gem_mmap_gtt@fault-concurrent-x.html>
* igt@kms_plane_cursor@pipe-b-viewport-size-64:
* shard-tglb: FAIL<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10085/shard-tglb5/igt@kms_plane_cursor@pipe-b-viewport-size-64.html> ([i915#3457]) -> FAIL<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20131/shard-tglb7/igt@kms_plane_cursor@pipe-b-viewport-size-64.html>
Known issues
Here are the changes found in Patchwork_20131_full that come from known issues:
IGT changes
Issues hit
* igt@api_intel_bb@blit-noreloc-purge-cache:
* shard-apl: NOTRUN -> DMESG-FAIL<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20131/shard-apl7/igt@api_intel_bb@blit-noreloc-purge-cache.html> ([i915#3457]) +1 similar issue
* shard-skl: NOTRUN -> DMESG-WARN<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20131/shard-skl9/igt@api_intel_bb@blit-noreloc-purge-cache.html> ([i915#3457])
* igt@api_intel_bb@blit-noreloc-purge-cache-random:
* shard-kbl: NOTRUN -> DMESG-WARN<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20131/shard-kbl2/igt@api_intel_bb@blit-noreloc-purge-cache-random.html> ([i915#3457]) +1 similar issue
* igt@gem_create@create-clear:
* shard-skl: PASS<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10085/shard-skl4/igt@gem_create@create-clear.html> -> FAIL<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20131/shard-skl1/igt@gem_create@create-clear.html> ([i915#3160])
* igt@gem_create@create-massive:
* shard-kbl: NOTRUN -> DMESG-WARN<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20131/shard-kbl7/igt@gem_create@create-massive.html> ([i915#3002])
* igt@gem_ctx_persistence@legacy-engines-queued:
* shard-snb: NOTRUN -> SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20131/shard-snb2/igt@gem_ctx_persistence@legacy-engines-queued.html> ([fdo#109271] / [i915#1099]) +4 similar issues
* igt@gem_eio@in-flight-contexts-10ms:
* shard-tglb: PASS<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10085/shard-tglb1/igt@gem_eio@in-flight-contexts-10ms.html> -> TIMEOUT<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20131/shard-tglb7/igt@gem_eio@in-flight-contexts-10ms.html> ([i915#3063] / [i915#3457])
* igt@gem_exec_fair@basic-none-share@rcs0:
* shard-tglb: PASS<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10085/shard-tglb1/igt@gem_exec_fair@basic-none-share@rcs0.html> -> FAIL<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20131/shard-tglb7/igt@gem_exec_fair@basic-none-share@rcs0.html> ([i915#2842] / [i915#3457])
* igt@gem_exec_fair@basic-pace-solo@rcs0:
* shard-glk: NOTRUN -> FAIL<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20131/shard-glk5/igt@gem_exec_fair@basic-pace-solo@rcs0.html> ([i915#3457]) +3 similar issues
* igt@gem_exec_fair@basic-pace@vcs0:
* shard-iclb: PASS<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10085/shard-iclb7/igt@gem_exec_fair@basic-pace@vcs0.html> -> FAIL<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20131/shard-iclb4/igt@gem_exec_fair@basic-pace@vcs0.html> ([i915#2842] / [i915#3457]) +1 similar issue
* igt@gem_exec_fair@basic-pace@vcs1:
* shard-iclb: NOTRUN -> FAIL<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20131/shard-iclb4/igt@gem_exec_fair@basic-pace@vcs1.html> ([i915#2842] / [i915#3457])
* shard-kbl: PASS<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10085/shard-kbl7/igt@gem_exec_fair@basic-pace@vcs1.html> -> FAIL<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20131/shard-kbl2/igt@gem_exec_fair@basic-pace@vcs1.html> ([i915#2842] / [i915#3457])
* igt@gem_exec_fence@syncobj-export:
* shard-glk: PASS<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10085/shard-glk7/igt@gem_exec_fence@syncobj-export.html> -> FAIL<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20131/shard-glk4/igt@gem_exec_fence@syncobj-export.html> ([i915#3457]) +23 similar issues
* igt@gem_exec_params@no-vebox:
* shard-tglb: NOTRUN -> SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20131/shard-tglb5/igt@gem_exec_params@no-vebox.html> ([fdo#109283])
* igt@gem_mmap_gtt@big-copy:
* shard-glk: PASS<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10085/shard-glk4/igt@gem_mmap_gtt@big-copy.html> -> FAIL<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20131/shard-glk8/igt@gem_mmap_gtt@big-copy.html> ([i915#307])
* igt@gem_mmap_gtt@cpuset-basic-small-copy:
* shard-tglb: PASS<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10085/shard-tglb3/igt@gem_mmap_gtt@cpuset-basic-small-copy.html> -> INCOMPLETE<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20131/shard-tglb8/igt@gem_mmap_gtt@cpuset-basic-small-copy.html> ([i915#3468])
* igt@gem_mmap_gtt@cpuset-basic-small-copy-odd:
* shard-snb: NOTRUN -> INCOMPLETE<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20131/shard-snb5/igt@gem_mmap_gtt@cpuset-basic-small-copy-odd.html> ([i915#3468])
* igt@gem_mmap_gtt@cpuset-big-copy-odd:
* shard-iclb: PASS<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10085/shard-iclb3/igt@gem_mmap_gtt@cpuset-big-copy-odd.html> -> FAIL<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20131/shard-iclb4/igt@gem_mmap_gtt@cpuset-big-copy-odd.html> ([i915#307])
* igt@gem_pwrite@basic-exhaustion:
* shard-snb: NOTRUN -> WARN<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20131/shard-snb7/igt@gem_pwrite@basic-exhaustion.html> ([i915#2658])
* igt@gem_render_copy@mixed-tiled-to-yf-tiled-ccs:
* shard-glk: NOTRUN -> INCOMPLETE<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20131/shard-glk5/igt@gem_render_copy@mixed-tiled-to-yf-tiled-ccs.html> ([i915#3468])
* igt@gem_render_copy@yf-tiled-ccs-to-linear:
* shard-apl: NOTRUN -> INCOMPLETE<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20131/shard-apl6/igt@gem_render_copy@yf-tiled-ccs-to-linear.html> ([i915#3468]) +2 similar issues
* igt@gem_render_copy@yf-tiled-ccs-to-x-tiled:
* shard-skl: NOTRUN -> INCOMPLETE<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20131/shard-skl1/igt@gem_render_copy@yf-tiled-ccs-to-x-tiled.html> ([i915#3468]) +1 similar issue
* igt@gem_render_copy@yf-tiled-ccs-to-y-tiled:
* shard-tglb: NOTRUN -> INCOMPLETE<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20131/shard-tglb5/igt@gem_render_copy@yf-tiled-ccs-to-y-tiled.html> ([i915#3468])
* igt@gem_spin_batch@engines@vcs0:
* shard-apl: NOTRUN -> FAIL<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20131/shard-apl7/igt@gem_spin_batch@engines@vcs0.html> ([i915#2898] / [i915#3457]) +3 similar issues
* igt@gem_userptr_blits@set-cache-level:
* shard-apl: NOTRUN -> FAIL<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20131/shard-apl7/igt@gem_userptr_blits@set-cache-level.html> ([i915#3324])
* igt@gem_userptr_blits@vma-merge:
* shard-snb: NOTRUN -> FAIL<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20131/shard-snb2/igt@gem_userptr_blits@vma-merge.html> ([i915#2724] / [i915#3457])
* igt@i915_hangman@engine-error@vcs1:
* shard-iclb: NOTRUN -> DMESG-WARN<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20131/shard-iclb4/igt@i915_hangman@engine-error@vcs1.html> ([i915#3457])
* igt@i915_hangman@error-state-capture@vcs1:
* shard-tglb: NOTRUN -> DMESG-WARN<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20131/shard-tglb5/igt@i915_hangman@error-state-capture@vcs1.html> ([i915#3457]) +4 similar issues
* igt@i915_pm_rpm@cursor:
* shard-glk: PASS<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10085/shard-glk8/igt@i915_pm_rpm@cursor.html> -> DMESG-WARN<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20131/shard-glk8/igt@i915_pm_rpm@cursor.html> ([i915#3457]) +1 similar issue
* igt@i915_pm_rpm@gem-mmap-type@uc:
* shard-apl: NOTRUN -> DMESG-WARN<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20131/shard-apl7/igt@i915_pm_rpm@gem-mmap-type@uc.html> ([i915#3475])
* igt@i915_pm_rpm@gem-mmap-type@wc:
* shard-tglb: PASS<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10085/shard-tglb3/igt@i915_pm_rpm@gem-mmap-type@wc.html> -> DMESG-WARN<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20131/shard-tglb2/igt@i915_pm_rpm@gem-mmap-type@wc.html> ([i915#2411] / [i915#3457])
* igt@i915_pm_rpm@modeset-lpsp-stress:
* shard-apl: NOTRUN -> SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20131/shard-apl6/igt@i915_pm_rpm@modeset-lpsp-stress.html> ([fdo#109271]) +116 similar issues
* igt@i915_pm_rps@min-max-config-idle:
* shard-glk: NOTRUN -> DMESG-WARN<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20131/shard-glk5/igt@i915_pm_rps@min-max-config-idle.html> ([i915#3457])
* igt@i915_pm_sseu@full-enable:
* shard-apl: NOTRUN -> DMESG-WARN<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20131/shard-apl7/igt@i915_pm_sseu@full-enable.html> ([i915#3457]) +1 similar issue
* igt@i915_selftest@live@hangcheck:
* shard-snb: NOTRUN -> INCOMPLETE<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20131/shard-snb7/igt@i915_selftest@live@hangcheck.html> ([i915#2782])
* igt@i915_selftest@live@mman:
* shard-snb: NOTRUN -> DMESG-WARN<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20131/shard-snb7/igt@i915_selftest@live@mman.html> ([i915#3457]) +1 similar issue
* igt@kms_atomic@plane-immutable-zpos:
* shard-glk: PASS<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10085/shard-glk4/igt@kms_atomic@plane-immutable-zpos.html> -> FAIL<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20131/shard-glk8/igt@kms_atomic@plane-immutable-zpos.html> ([i915#2657] / [i915#3457])
* igt@kms_big_fb@yf-tiled-64bpp-rotate-90:
* shard-tglb: NOTRUN -> SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20131/shard-tglb5/igt@kms_big_fb@yf-tiled-64bpp-rotate-90.html> ([fdo#111615])
* igt@kms_big_joiner@basic:
* shard-glk: NOTRUN -> SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20131/shard-glk5/igt@kms_big_joiner@basic.html> ([fdo#109271] / [i915#2705])
* igt@kms_color@pipe-a-ctm-0-75:
* shard-skl: PASS<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10085/shard-skl1/igt@kms_color@pipe-a-ctm-0-75.html> -> DMESG-WARN<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20131/shard-skl9/igt@kms_color@pipe-a-ctm-0-75.html> ([i915#1982]) +1 similar issue
* igt@kms_color_chamelium@pipe-a-ctm-0-25:
* shard-snb: NOTRUN -> SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20131/shard-snb7/igt@kms_color_chamelium@pipe-a-ctm-0-25.html> ([fdo#109271] / [fdo#111827]) +26 similar issues
* igt@kms_color_chamelium@pipe-b-ctm-max:
* shard-kbl: NOTRUN -> SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20131/shard-kbl2/igt@kms_color_chamelium@pipe-b-ctm-max.html> ([fdo#109271] / [fdo#111827]) +2 similar issues
* igt@kms_color_chamelium@pipe-b-ctm-red-to-blue:
* shard-tglb: NOTRUN -> SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20131/shard-tglb5/igt@kms_color_chamelium@pipe-b-ctm-red-to-blue.html> ([fdo#109284] / [fdo#111827]) +2 similar issues
* igt@kms_color_chamelium@pipe-c-ctm-0-25:
* shard-apl: NOTRUN -> SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20131/shard-apl7/igt@kms_color_chamelium@pipe-c-ctm-0-25.html> ([fdo#109271] / [fdo#111827]) +12 similar issues
* igt@kms_color_chamelium@pipe-c-ctm-0-5:
* shard-skl: NOTRUN -> SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20131/shard-skl8/igt@kms_color_chamelium@pipe-c-ctm-0-5.html> ([fdo#109271] / [fdo#111827]) +3 similar issues
* igt@kms_color_chamelium@pipe-d-ctm-0-25:
* shard-glk: NOTRUN -> SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20131/shard-glk5/igt@kms_color_chamelium@pipe-d-ctm-0-25.html> ([fdo#109271] / [fdo#111827]) +4 similar issues
* igt@kms_content_protection@lic:
* shard-apl: NOTRUN -> TIMEOUT<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20131/shard-apl7/igt@kms_content_protection@lic.html> ([i915#1319]) +1 similar issue
* igt@kms_cursor_crc@pipe-a-cursor-32x32-random:
* shard-tglb: NOTRUN -> SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20131/shard-tglb5/igt@kms_cursor_crc@pipe-a-cursor-32x32-random.html> ([i915#3319] / [i915#3457])
* igt@kms_cursor_crc@pipe-a-cursor-64x21-sliding:
* shard-apl: NOTRUN -> FAIL<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20131/shard-apl7/igt@kms_cursor_crc@pipe-a-cursor-64x21-sliding.html> ([i915#3444] / [i915#3457]) +3 similar issues
* igt@kms_cursor_crc@pipe-a-cursor-64x64-offscreen:
* shard-iclb: PASS<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10085/shard-iclb6/igt@kms_cursor_crc@pipe-a-cursor-64x64-offscreen.html> -> FAIL<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20131/shard-iclb6/igt@kms_cursor_crc@pipe-a-cursor-64x64-offscreen.html> ([i915#3457]) +1 similar issue
* igt@kms_cursor_crc@pipe-a-cursor-dpms:
* shard-glk: NOTRUN -> FAIL<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20131/shard-glk5/igt@kms_cursor_crc@pipe-a-cursor-dpms.html> ([i915#3444] / [i915#3457]) +1 similar issue
* igt@kms_cursor_crc@pipe-a-cursor-suspend:
* shard-skl: NOTRUN -> INCOMPLETE<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20131/shard-skl9/igt@kms_cursor_crc@pipe-a-cursor-suspend.html> ([i915#2828] / [i915#300])
* igt@kms_cursor_crc@pipe-b-cursor-256x256-random:
* shard-snb: NOTRUN -> FAIL<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20131/shard-snb2/igt@kms_cursor_crc@pipe-b-cursor-256x256-random.html> ([i915#3457]) +11 similar issues
* igt@kms_cursor_crc@pipe-b-cursor-256x256-sliding:
* shard-skl: NOTRUN -> FAIL<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20131/shard-skl8/igt@kms_cursor_crc@pipe-b-cursor-256x256-sliding.html> ([i915#3444] / [i915#3457]) +3 similar issues
* igt@kms_cursor_crc@pipe-b-cursor-256x85-onscreen:
* shard-tglb: NOTRUN -> FAIL<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20131/shard-tglb5/igt@kms_cursor_crc@pipe-b-cursor-256x85-onscreen.html> ([i915#2124] / [i915#3457]) +3 similar issues
* igt@kms_cursor_crc@pipe-b-cursor-512x512-rapid-movement:
* shard-skl: NOTRUN -> SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20131/shard-skl9/igt@kms_cursor_crc@pipe-b-cursor-512x512-rapid-movement.html> ([fdo#109271] / [i915#3457]) +3 similar issues
* igt@kms_cursor_crc@pipe-b-cursor-64x21-offscreen:
* shard-skl: PASS<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10085/shard-skl7/igt@kms_cursor_crc@pipe-b-cursor-64x21-offscreen.html> -> FAIL<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20131/shard-skl4/igt@kms_cursor_crc@pipe-b-cursor-64x21-offscreen.html> ([i915#3444] / [i915#3457]) +2 similar issues
* igt@kms_cursor_crc@pipe-b-cursor-64x21-onscreen:
* shard-apl: PASS<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10085/shard-apl6/igt@kms_cursor_crc@pipe-b-cursor-64x21-onscreen.html> -> FAIL<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20131/shard-apl1/igt@kms_cursor_crc@pipe-b-cursor-64x21-onscreen.html> ([i915#3444] / [i915#3457]) +1 similar issue
* igt@kms_cursor_crc@pipe-c-cursor-256x256-offscreen:
* shard-kbl: NOTRUN -> FAIL<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20131/shard-kbl2/igt@kms_cursor_crc@pipe-c-cursor-256x256-offscreen.html> ([i915#3444] / [i915#3457]) +4 similar issues
* igt@kms_cursor_crc@pipe-c-cursor-512x170-onscreen:
* shard-glk: NOTRUN -> SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20131/shard-glk5/igt@kms_cursor_crc@pipe-c-cursor-512x170-onscreen.html> ([fdo#109271] / [i915#3457]) +5 similar issues
* igt@kms_cursor_crc@pipe-c-cursor-512x512-sliding:
* shard-tglb: NOTRUN -> SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20131/shard-tglb5/igt@kms_cursor_crc@pipe-c-cursor-512x512-sliding.html> ([fdo#109279] / [i915#3359] / [i915#3457])
* igt@kms_cursor_crc@pipe-c-cursor-64x21-onscreen:
* shard-glk: PASS<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10085/shard-glk6/igt@kms_cursor_crc@pipe-c-cursor-64x21-onscreen.html> -> FAIL<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20131/shard-glk6/igt@kms_cursor_crc@pipe-c-cursor-64x21-onscreen.html> ([i915#3444] / [i915#3457]) +3 similar issues
* igt@kms_cursor_crc@pipe-d-cursor-256x85-rapid-movement:
* shard-apl: NOTRUN -> SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20131/shard-apl6/igt@kms_cursor_crc@pipe-d-cursor-256x85-rapid-movement.html> ([fdo#109271] / [i915#3457]) +19 similar issues
* igt@kms_cursor_crc@pipe-d-cursor-32x10-rapid-movement:
* shard-snb: NOTRUN -> SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20131/shard-snb2/igt@kms_cursor_crc@pipe-d-cursor-32x10-rapid-movement.html> ([fdo#109271] / [i915#3457]) +49 similar issues
* igt@kms_cursor_crc@pipe-d-cursor-64x21-offscreen:
* shard-tglb: PASS<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10085/shard-tglb1/igt@kms_cursor_crc@pipe-d-cursor-64x21-offscreen.html> -> FAIL<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20131/shard-tglb1/igt@kms_cursor_crc@pipe-d-cursor-64x21-offscreen.html> ([i915#2124] / [i915#3457]) +4 similar issues
* igt@kms_cursor_crc@pipe-d-cursor-max-size-sliding:
* shard-kbl: NOTRUN -> SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20131/shard-kbl2/igt@kms_cursor_crc@pipe-d-cursor-max-size-sliding.html> ([fdo#109271] / [i915#3457]) +6 similar issues
* igt@kms_cursor_edge_walk@pipe-b-64x64-bottom-edge:
* shard-glk: PASS<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10085/shard-glk8/igt@kms_cursor_edge_walk@pipe-b-64x64-bottom-edge.html> -> FAIL<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20131/shard-glk8/igt@kms_cursor_edge_walk@pipe-b-64x64-bottom-edge.html> ([i915#70]) +1 similar issue
* igt@kms_flip@2x-flip-vs-absolute-wf_vblank-interruptible:
* shard-tglb: NOTRUN -> SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20131/shard-tglb5/igt@kms_flip@2x-flip-vs-absolute-wf_vblank-interruptible.html> ([fdo#111825]) +12 similar issues
* igt@kms_flip@flip-vs-suspend@b-dp1:
* shard-kbl: PASS<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10085/shard-kbl3/igt@kms_flip@flip-vs-suspend@b-dp1.html> -> DMESG-WARN<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20131/shard-kbl4/igt@kms_flip@flip-vs-suspend@b-dp1.html> ([i915#180]) +2 similar issues
* igt@kms_flip_scaled_crc@flip-32bpp-ytileccs-to-64bpp-ytile:
* shard-apl: NOTRUN -> SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20131/shard-apl7/igt@kms_flip_scaled_crc@flip-32bpp-ytileccs-to-64bpp-ytile.html> ([fdo#109271] / [i915#2642])
* igt@kms_frontbuffer_tracking@fbc-1p-shrfb-fliptrack-mmap-gtt:
* shard-skl: NOTRUN -> SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20131/shard-skl1/igt@kms_frontbuffer_tracking@fbc-1p-shrfb-fliptrack-mmap-gtt.html> ([fdo#109271]) +29 similar issues
* igt@kms_frontbuffer_tracking@fbcpsr-1p-offscren-pri-indfb-draw-blt:
* shard-kbl: NOTRUN -> SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20131/shard-kbl2/igt@kms_frontbuffer_tracking@fbcpsr-1p-offscren-pri-indfb-draw-blt.html> ([fdo#109271]) +48 similar issues
* igt@kms_frontbuffer_tracking@fbcpsr-rgb101010-draw-mmap-cpu:
* shard-glk: NOTRUN -> SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20131/shard-glk5/igt@kms_frontbuffer_tracking@fbcpsr-rgb101010-draw-mmap-cpu.html> ([fdo#109271]) +21 similar issues
* igt@kms_frontbuffer_tracking@psr-1p-primscrn-cur-indfb-onoff:
* shard-snb: NOTRUN -> SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20131/shard-snb7/igt@kms_frontbuffer_tracking@psr-1p-primscrn-cur-indfb-onoff.html> ([fdo#109271]) +391 similar issues
* igt@kms_pipe_crc_basic@compare-crc-sanitycheck-pipe-d:
* shard-apl: NOTRUN -> SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20131/shard-apl7/igt@kms_pipe_crc_basic@compare-crc-sanitycheck-pipe-d.html> ([fdo#109271] / [i915#533])
* igt@kms_plane_alpha_blend@pipe-b-alpha-7efc:
* shard-apl: NOTRUN -> FAIL<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20131/shard-apl6/igt@kms_plane_alpha_blend@pipe-b-alpha-7efc.html> ([fdo#108145] / [i915#265])
* shard-kbl: NOTRUN -> FAIL<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20131/shard-kbl2/igt@kms_plane_alpha_blend@pipe-b-alpha-7efc.html> ([fdo#108145] / [i915#265] / [i915#3457])
* igt@kms_plane_alpha_blend@pipe-b-alpha-transparent-fb:
* shard-apl: NOTRUN -> FAIL<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20131/shard-apl7/igt@kms_plane_alpha_blend@pipe-b-alpha-transparent-fb.html> ([i915#265])
* igt@kms_plane_alpha_blend@pipe-b-constant-alpha-min:
* shard-skl: NOTRUN -> FAIL<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20131/shard-skl9/igt@kms_plane_alpha_blend@pipe-b-constant-alpha-min.html> ([fdo#108145] / [i915#265])
* igt@kms_plane_cursor@pipe-a-primary-size-64:
* shard-snb: NOTRUN -> FAIL<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20131/shard-snb2/igt@kms_plane_cursor@pipe-a-primary-size-64.html> ([i915#3461]) +1 similar issue
* igt@kms_plane_cursor@pipe-b-overlay-size-64:
* shard-iclb: PASS<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10085/shard-iclb2/igt@kms_plane_cursor@pipe-b-overlay-size-64.html> -> FAIL<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20131/shard-iclb7/igt@kms_plane_cursor@pipe-b-overlay-size-64.html> ([i915#2657] / [i915#3457])
* igt@kms_plane_cursor@pipe-b-primary-size-64:
* shard-skl: NOTRUN -> FAIL<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20131/shard-skl8/igt@kms_plane_cursor@pipe-b-primary-size-64.html> ([i915#2657] / [i915#3457]) +1 similar issue
* igt@kms_plane_lowres@pipe-b-tiling-none:
* shard-glk: PASS<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10085/shard-glk8/igt@kms_plane_lowres@pipe-b-tiling-none.html> -> FAIL<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20131/shard-glk8/igt@kms_plane_lowres@pipe-b-tiling-none.html> ([i915#3457] / [i915#899])
* igt@kms_psr2_sf@overlay-plane-update-sf-dmg-area-4:
* shard-apl: NOTRUN -> SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20131/shard-apl7/igt@kms_psr2_sf@overlay-plane-update-sf-dmg-area-4.html> ([fdo#109271] / [i915#658]) +4 similar issues
* igt@kms_psr2_sf@overlay-primary-update-sf-dmg-area-2:
* shard-glk: NOTRUN -> SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20131/shard-glk5/igt@kms_psr2_sf@overlay-primary-update-sf-dmg-area-2.html> ([fdo#109271] / [i915#658])
* igt@kms_psr2_sf@overlay-primary-update-sf-dmg-area-5:
* shard-kbl: NOTRUN -> SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20131/shard-kbl7/igt@kms_psr2_sf@overlay-primary-update-sf-dmg-area-5.html> ([fdo#109271] / [i915#658]) +2 similar issues
* igt@kms_psr2_sf@plane-move-sf-dmg-area-0:
* shard-skl: NOTRUN -> SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20131/shard-skl1/igt@kms_psr2_sf@plane-move-sf-dmg-area-0.html> ([fdo#109271] / [i915#658]) +2 similar issues
* igt@kms_psr@psr2_cursor_render:
* shard-iclb: PASS<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10085/shard-iclb2/igt@kms_psr@psr2_cursor_render.html> -> SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20131/shard-iclb7/igt@kms_psr@psr2_cursor_render.html> ([fdo#109441])
* igt@kms_writeback@writeback-fb-id:
* shard-apl: NOTRUN -> SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20131/shard-apl7/igt@kms_writeback@writeback-fb-id.html> ([fdo#109271] / [i915#2437])
* igt@nouveau_crc@pipe-b-ctx-flip-detection:
* shard-tglb: NOTRUN -> SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20131/shard-tglb5/igt@nouveau_crc@pipe-b-ctx-flip-detection.html> ([i915#2530])
* igt@perf_pmu@busy-idle@bcs0:
* shard-apl: NOTRUN -> FAIL<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20131/shard-apl7/igt@perf_pmu@busy-idle@bcs0.html> ([i915#3457]) +3 similar issues
* igt@perf_pmu@busy-idle@vecs0:
* shard-apl: NOTRUN -> WARN<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20131/shard-apl7/igt@perf_pmu@busy-idle@vecs0.html> ([i915#3457]) +2 similar issues
* igt@prime_nv_test@i915_import_cpu_mmap:
* shard-tglb: NOTRUN -> SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20131/shard-tglb5/igt@prime_nv_test@i915_import_cpu_mmap.html> ([fdo#109291])
* igt@prime_vgem@fence-flip-hang:
* shard-tglb: NOTRUN -> SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20131/shard-tglb5/igt@prime_vgem@fence-flip-hang.html> ([fdo#109295])
* igt@sysfs_clients@recycle-many:
* shard-glk: NOTRUN -> SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20131/shard-glk5/igt@sysfs_clients@recycle-many.html> ([fdo#109271] / [i915#2994])
* igt@sysfs_clients@split-50:
* shard-kbl: NOTRUN -> SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20131/shard-kbl2/igt@sysfs_clients@split-50.html> ([fdo#109271] / [i915#2994]) +1 similar issue
* shard-apl: NOTRUN -> SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20131/shard-apl6/igt@sysfs_clients@split-50.html> ([fdo#109271] / [i915#2994])
* igt@sysfs_heartbeat_interval@mixed@vcs1:
* shard-kbl: PASS<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10085/shard-kbl7/igt@sysfs_heartbeat_interval@mixed@vcs1.html> -> INCOMPLETE<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20131/shard-kbl4/igt@sysfs_heartbeat_interval@mixed@vcs1.html> ([i915#1731] / [i915#3457])
* igt@sysfs_heartbeat_interval@mixed@vecs0:
* shard-apl: NOTRUN -> FAIL<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20131/shard-apl7/igt@sysfs_heartbeat_interval@mixed@vecs0.html> ([i915#1731] / [i915#3457]) +3 similar issues
* igt@sysfs_preempt_timeout@timeout@vecs0:
* shard-apl: PASS<https://intel-gfx-ci.01> -> [FAIL][132] ([i915#1755] / [i915#3457]) +1 similar issue
diff --git a/drivers/gpu/drm/i915/display/intel_display.c b/drivers/gpu/drm/i915/display/intel_display.c index 0c2b194006f8..51f499271cc8 100644 --- a/drivers/gpu/drm/i915/display/intel_display.c +++ b/drivers/gpu/drm/i915/display/intel_display.c @@ -8548,6 +8548,11 @@ intel_pipe_config_compare(const struct intel_crtc_state *current_config, bp_gamma = intel_color_get_gamma_bit_precision(pipe_config); if (bp_gamma) PIPE_CONF_CHECK_COLOR_LUT(gamma_mode, hw.gamma_lut, bp_gamma); + + PIPE_CONF_CHECK_BOOL(has_psr); + PIPE_CONF_CHECK_BOOL(has_psr2); + PIPE_CONF_CHECK_BOOL(enable_psr2_sel_fetch); + PIPE_CONF_CHECK_I(dc3co_exitline); } PIPE_CONF_CHECK_BOOL(double_wide); @@ -8631,11 +8636,6 @@ intel_pipe_config_compare(const struct intel_crtc_state *current_config, PIPE_CONF_CHECK_I(vrr.flipline); PIPE_CONF_CHECK_I(vrr.pipeline_full); - PIPE_CONF_CHECK_BOOL(has_psr); - PIPE_CONF_CHECK_BOOL(has_psr2); - PIPE_CONF_CHECK_BOOL(enable_psr2_sel_fetch); - PIPE_CONF_CHECK_I(dc3co_exitline); - #undef PIPE_CONF_CHECK_X #undef PIPE_CONF_CHECK_I #undef PIPE_CONF_CHECK_BOOL
Commit 78b772e1a01f ("drm/i915/display: Fill PSR state during hardware configuration read out") is not allowing fastsets to happen when PSR states changes but PSR is a feature that can be enabled and disabled during fastsets. So here moving the PSR pipe conf checks to a block that is only executed when checking if HW state matches with requested state, not during the phase where it checks if fastset is possible or not. There still a state mismatch not allowing fastsets between states turning off or on PSR because of crtc_state->infoframes.enable BIT(DP_SDP_VSC) but at least for now it will allow a fastset between PSR1 <-> PSR2, that is a case heavilly used by CI due to pipe CRC not work with PSR2, but the remaning issue will be fixed in a future patch. Cc: Gwan-gyeong Mun <gwan-gyeong.mun@intel.com> Cc: Radhakrishna Sripada <radhakrishna.sripada@intel.com> Reported-by: Ville Syrjälä <ville.syrjala@linux.intel.com> Fixes: 78b772e1a01f ("drm/i915/display: Fill PSR state during hardware configuration read out") Signed-off-by: José Roberto de Souza <jose.souza@intel.com> --- drivers/gpu/drm/i915/display/intel_display.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)