[v2,1/5] drm/i915/psr: Add bits per pixel limitation

Commit Message

Souza, Jose Nov. 26, 2019, 12:53 a.m. UTC

PSR2 HW only support a limited number of bits per pixel, if mode has
more than supported PSR2 should not be enabled.

BSpec: 50422
BSpec: 7713
Cc: Gwan-gyeong Mun <[e-mail]>
Cc: Matt Roper <[e-mail]>
Reviewed-by: Lucas De Marchi <[e-mail]>
Signed-off-by: José Roberto de Souza <[e-mail]>
---
 drivers/gpu/drm/i915/display/intel_psr.c | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

Comments

Souza, Jose Nov. 27, 2019, 9:58 p.m. UTC | #1

On Wed, 2019-11-27 at 09:23 +0000, Patchwork wrote:
> == Series Details ==
> 
> Series: series starting with [v2,1/5] drm/i915/psr: Add bits per
> pixel limitation (rev2)
> URL   : https://patchwork.freedesktop.org/series/70002/
> State : failure
> 
> == Summary ==
> 
> CI Bug Log - changes from CI_DRM_7426_full -> Patchwork_15445_full
> ====================================================
> 
> Summary
> -------
> 
>   **FAILURE**
> 
>   Serious unknown changes coming with Patchwork_15445_full absolutely
> need to be
>   verified manually.
>   
>   If you think the reported changes have nothing to do with the
> changes
>   introduced in Patchwork_15445_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_15445_full:
> 
> ### IGT changes ###
> 
> #### Possible regressions ####
> 
>   * igt@kms_plane@pixel-format-pipe-b-planes:
>     - shard-skl:          [PASS][1] -> [INCOMPLETE][2] +2 similar
> issues
>    [1]: 
> https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7426/shard-skl5/igt@[e-mail]
>    [2]: 
> https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15445/shard-skl4/igt@[e-mail]
> 

Not related with this changes.

>   
> Known issues
> ------------
> 
>   Here are the changes found in Patchwork_15445_full that come from
> known issues:
> 
> ### IGT changes ###
> 
> #### Issues hit ####
> 
>   * igt@gem_ctx_isolation@rcs0-s3:
>     - shard-apl:          [PASS][3] -> [DMESG-WARN][4] ([fdo#108566])
> +4 similar issues
>    [3]: 
> https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7426/shard-apl2/igt@[e-mail]
>    [4]: 
> https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15445/shard-apl6/igt@[e-mail]
> 
>   * igt@gem_exec_parallel@vcs1-fds:
>     - shard-kbl:          [PASS][5] -> [INCOMPLETE][6] ([fdo#103665])
> +1 similar issue
>    [5]: 
> https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7426/shard-kbl1/igt@[e-mail]
>    [6]: 
> https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15445/shard-kbl4/igt@[e-mail]
> 
>   * igt@gem_ppgtt@flink-and-close-vma-leak:
>     - shard-glk:          [PASS][7] -> [FAIL][8] ([fdo#112392])
>    [7]: 
> https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7426/shard-glk3/igt@[e-mail]
>    [8]: 
> https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15445/shard-glk4/igt@[e-mail]
>     - shard-skl:          [PASS][9] -> [FAIL][10] ([fdo#112392])
>    [9]: 
> https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7426/shard-skl5/igt@[e-mail]
>    [10]: 
> https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15445/shard-skl4/igt@[e-mail]
> 
>   * igt@gem_userptr_blits@sync-unmap:
>     - shard-snb:          [PASS][11] -> [DMESG-WARN][12]
> ([fdo#111870]) +1 similar issue
>    [11]: 
> https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7426/shard-snb5/igt@[e-mail]
>    [12]: 
> https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15445/shard-snb1/igt@[e-mail]
> 
>   * igt@gem_userptr_blits@sync-unmap-after-close:
>     - shard-hsw:          [PASS][13] -> [DMESG-WARN][14]
> ([fdo#111870]) +1 similar issue
>    [13]: 
> https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7426/shard-hsw8/igt@[e-mail]
>    [14]: 
> https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15445/shard-hsw7/igt@[e-mail]
> 
>   * igt@gem_workarounds@suspend-resume-context:
>     - shard-tglb:         [PASS][15] -> [INCOMPLETE][16]
> ([fdo#111832] / [fdo#111850])
>    [15]: 
> https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7426/shard-tglb6/igt@[e-mail]
>    [16]: 
> https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15445/shard-tglb4/igt@[e-mail]
> 
>   * igt@i915_pm_dc@dc6-dpms:
>     - shard-iclb:         [PASS][17] -> [FAIL][18] ([fdo#111830 ])
>    [17]: 
> https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7426/shard-iclb8/igt@[e-mail]
>    [18]: 
> https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15445/shard-iclb3/igt@[e-mail]
> 
>   * igt@i915_pm_rpm@system-suspend-modeset:
>     - shard-kbl:          [PASS][19] -> [INCOMPLETE][20]
> ([fdo#103665] / [fdo#107807])
>    [19]: 
> https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7426/shard-kbl4/igt@[e-mail]
>    [20]: 
> https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15445/shard-kbl6/igt@[e-mail]
> 
>   * igt@kms_cursor_crc@pipe-a-cursor-suspend:
>     - shard-kbl:          [PASS][21] -> [DMESG-WARN][22]
> ([fdo#108566]) +3 similar issues
>    [21]: 
> https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7426/shard-kbl2/igt@[e-mail]
>    [22]: 
> https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15445/shard-kbl7/igt@[e-mail]
> 
>   * igt@kms_cursor_legacy@cursorb-vs-flipb-varying-size:
>     - shard-hsw:          [PASS][23] -> [SKIP][24] ([fdo#109271])
>    [23]: 
> https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7426/shard-hsw2/igt@[e-mail]
>    [24]: 
> https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15445/shard-hsw1/igt@[e-mail]
> 
>   * igt@kms_cursor_legacy@pipe-a-forked-move:
>     - shard-hsw:          [PASS][25] -> [INCOMPLETE][26]
> ([fdo#103540]) +1 similar issue
>    [25]: 
> https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7426/shard-hsw2/igt@[e-mail]
>    [26]: 
> https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15445/shard-hsw5/igt@[e-mail]
> 
>   * igt@kms_flip@flip-vs-suspend-interruptible:
>     - shard-tglb:         [PASS][27] -> [INCOMPLETE][28]
> ([fdo#111832] / [fdo#111850] / [fdo#112031])
>    [27]: 
> https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7426/shard-tglb6/igt@[e-mail]
>    [28]: 
> https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15445/shard-tglb2/igt@[e-mail]
> 
>   * igt@kms
> _frontbuffer_tracking@fbcpsr-1p-primscrn-cur-indfb-draw-render:
>     - shard-tglb:         [PASS][29] -> [INCOMPLETE][30]
> ([fdo#111884]) +1 similar issue
>    [29]: 
> https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7426/shard-tglb4/igt@[e-mail]
>    [30]: 
> https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15445/shard-tglb4/igt@[e-mail]
> 
>   * igt@kms_frontbuffer_tracking@fbcpsr-indfb-scaledprimary:
>     - shard-tglb:         [PASS][31] -> [FAIL][32] ([fdo#103167]) +2
> similar issues
>    [31]: 
> https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7426/shard-tglb8/igt@[e-mail]
>    [32]: 
> https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15445/shard-tglb4/igt@[e-mail]
> 
>   * igt@kms_frontbuffer_tracking@fbcpsr-suspend:
>     - shard-tglb:         [PASS][33] -> [INCOMPLETE][34]
> ([fdo#111832] / [fdo#111850] / [fdo#111884])
>    [33]: 
> https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7426/shard-tglb6/igt@[e-mail]
>    [34]: 
> https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15445/shard-tglb3/igt@[e-mail]
> 
>   * igt@kms_frontbuffer_tracking@psr-1p-primscrn-cur-indfb-draw-blt:
>     - shard-iclb:         [PASS][35] -> [INCOMPLETE][36]
> ([fdo#106978] / [fdo#107713])
>    [35]: 
> https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7426/shard-iclb8/igt@[e-mail]
>    [36]: 
> https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15445/shard-iclb3/igt@[e-mail]
> 
>   * igt@kms_frontbuffer_tracking@psr-1p-primscrn-shrfb-plflip-blt:
>     - shard-skl:          [PASS][37] -> [INCOMPLETE][38]
> ([fdo#106978])
>    [37]: 
> https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7426/shard-skl6/igt@[e-mail]
>    [38]: 
> https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15445/shard-skl7/igt@[e-mail]
> 
>   * igt@kms_frontbuffer_tracking@psr-suspend:
>     - shard-skl:          [PASS][39] -> [INCOMPLETE][40]
> ([fdo#104108] / [fdo#106978])
>    [39]: 
> https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7426/shard-skl7/igt@[e-mail]
>    [40]: 
> https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15445/shard-skl6/igt@[e-mail]
> 
>   * igt@kms_plane_alpha_blend@pipe-b-coverage-7efc:
>     - shard-skl:          [PASS][41] -> [FAIL][42] ([fdo#108145] /
> [fdo#110403])
>    [41]: 
> https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7426/shard-skl2/igt@[e-mail]
>    [42]: 
> https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15445/shard-skl5/igt@[e-mail]
> 
>   
> #### Possible fixes ####
> 
>   * igt@gem_ctx_isolation@rcs0-s3:
>     - shard-kbl:          [DMESG-WARN][43] ([fdo#108566]) ->
> [PASS][44] +6 similar issues
>    [43]: 
> https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7426/shard-kbl2/igt@[e-mail]
>    [44]: 
> https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15445/shard-kbl1/igt@[e-mail]
> 
>   * igt@gem_ctx_persistence@smoketest:
>     - shard-glk:          [TIMEOUT][45] ([fdo#112404]) -> [PASS][46]
>    [45]: 
> https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7426/shard-glk7/igt@[e-mail]
>    [46]: 
> https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15445/shard-glk9/igt@[e-mail]
> 
>   * igt@gem_ctx_switch@vcs1-heavy-queue:
>     - shard-iclb:         [SKIP][47] ([fdo#112080]) -> [PASS][48] +3
> similar issues
>    [47]: 
> https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7426/shard-iclb8/igt@[e-mail]
>    [48]: 
> https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15445/shard-iclb1/igt@[e-mail]
> 
>   * igt@gem_eio@in-flight-suspend:
>     - shard-tglb:         [INCOMPLETE][49] ([fdo#111832] /
> [fdo#111850] / [fdo#112081]) -> [PASS][50]
>    [49]: 
> https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7426/shard-tglb2/igt@[e-mail]
>    [50]: 
> https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15445/shard-tglb8/igt@[e-mail]
> 
>   * igt@gem_eio@kms:
>     - shard-snb:          [INCOMPLETE][51] ([fdo#105411]) ->
> [PASS][52]
>    [51]: 
> https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7426/shard-snb6/igt@[e-mail]
>    [52]: 
> https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15445/shard-snb7/igt@[e-mail]
> 
>   * igt@gem_exec_schedule@preempt-queue-bsd2:
>     - shard-iclb:         [SKIP][53] ([fdo#109276]) -> [PASS][54] +2
> similar issues
>    [53]: 
> https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7426/shard-iclb3/igt@[e-mail]
>    [54]: 
> https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15445/shard-iclb2/igt@[e-mail]
>     - shard-tglb:         [INCOMPLETE][55] ([fdo#111606] /
> [fdo#111677]) -> [PASS][56]
>    [55]: 
> https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7426/shard-tglb6/igt@[e-mail]
>    [56]: 
> https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15445/shard-tglb1/igt@[e-mail]
> 
>   * igt@gem
> _persistent_relocs@forked-interruptible-faulting-reloc-thrash-inactive
> :
>     - shard-hsw:          [TIMEOUT][57] ([fdo#112068 ]) -> [PASS][58]
>    [57]: 
> https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7426/shard-hsw2/igt@[e-mail]
>    [58]: 
> https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15445/shard-hsw6/igt@[e-mail]
> 
>   * igt@gem_ppgtt@flink-and-close-vma-leak:
>     - shard-kbl:          [FAIL][59] ([fdo#112392]) -> [PASS][60]
>    [59]: 
> https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7426/shard-kbl4/igt@[e-mail]
>    [60]: 
> https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15445/shard-kbl6/igt@[e-mail]
> 
>   * igt@gem_sync@basic-all:
>     - shard-tglb:         [INCOMPLETE][61] ([fdo#111880]) ->
> [PASS][62]
>    [61]: 
> https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7426/shard-tglb6/igt@[e-mail]
>    [62]: 
> https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15445/shard-tglb8/igt@[e-mail]
> 
>   * igt@gem_userptr_blits@map-fixed-invalidate-busy-gup:
>     - shard-snb:          [DMESG-WARN][63] ([fdo#111870]) ->
> [PASS][64] +2 similar issues
>    [63]: 
> https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7426/shard-snb4/igt@[e-mail]
>    [64]: 
> https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15445/shard-snb6/igt@[e-mail]
> 
>   * igt@gem_userptr_blits@map-fixed-invalidate-overlap-busy:
>     - shard-hsw:          [DMESG-WARN][65] ([fdo#111870]) ->
> [PASS][66]
>    [65]: 
> https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7426/shard-hsw4/igt@[e-mail]
>    [66]: 
> https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15445/shard-hsw4/igt@[e-mail]
> 
>   * igt@kms_color@pipe-a-ctm-0-75:
>     - shard-skl:          [DMESG-WARN][67] ([fdo#106107]) ->
> [PASS][68]
>    [67]: 
> https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7426/shard-skl4/igt@[e-mail]
>    [68]: 
> https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15445/shard-skl1/igt@[e-mail]
> 
>   * igt@kms_cursor_legacy@cursor-vs-flip-varying-size:
>     - shard-hsw:          [FAIL][69] ([fdo#103355]) -> [PASS][70]
>    [69]: 
> https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7426/shard-hsw5/igt@[e-mail]
>    [70]: 
> https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15445/shard-hsw1/igt@[e-mail]
> 
>   * igt@kms
> _cursor_legacy@flip-vs-cursor-atomic-transitions-varying-size:
>     - shard-skl:          [FAIL][71] ([fdo#102670]) -> [PASS][72]
>    [71]: 
> https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7426/shard-skl6/igt@[e-mail]
>    [72]: 
> https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15445/shard-skl7/igt@[e-mail]
> 
>   * igt@kms_flip@flip-vs-expired-vblank:
>     - shard-skl:          [FAIL][73] ([fdo#105363]) -> [PASS][74]
>    [73]: 
> https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7426/shard-skl1/igt@[e-mail]
>    [74]: 
> https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15445/shard-skl1/igt@[e-mail]
> 
>   * igt@kms_flip@flip-vs-suspend-interruptible:
>     - shard-apl:          [DMESG-WARN][75] ([fdo#108566]) ->
> [PASS][76] +1 similar issue
>    [75]: 
> https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7426/shard-apl4/igt@[e-mail]
>    [76]: 
> https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15445/shard-apl7/igt@[e-mail]
> 
>   * igt@kms
> _frontbuffer_tracking@fbc-1p-primscrn-cur-indfb-draw-pwrite:
>     - shard-tglb:         [INCOMPLETE][77] ([fdo#111884]) ->
> [PASS][78] +1 similar issue
>    [77]: 
> https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7426/shard-tglb4/igt@[e-mail]
>    [78]: 
> https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15445/shard-tglb2/igt@[e-mail]
> 
>   * igt@kms_frontbuffer_tracking@fbc-1p-primscrn-cur-indfb-onoff:
>     - shard-tglb:         [INCOMPLETE][79] ([fdo#111747] /
> [fdo#111884]) -> [PASS][80] +1 similar issue
>    [79]: 
> https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7426/shard-tglb7/igt@[e-mail]
>    [80]: 
> https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15445/shard-tglb3/igt@[e-mail]
> 
>   * igt@kms_frontbuffer_tracking@fbc-1p-primscrn-indfb-msflip-blt:
>     - shard-tglb:         [FAIL][81] ([fdo#103167]) -> [PASS][82] +4
> similar issues
>    [81]: 
> https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7426/shard-tglb3/igt@[e-mail]
>    [82]: 
> https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15445/shard-tglb7/igt@[e-mail]
> 
>   * igt@kms_frontbuffer_tracking@fbc-indfb-scaledprimary:
>     - shard-kbl:          [INCOMPLETE][83] ([fdo#103665]) ->
> [PASS][84] +1 similar issue
>    [83]: 
> https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7426/shard-kbl7/igt@[e-mail]
>    [84]: 
> https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15445/shard-kbl4/igt@[e-mail]
> 
>   * igt@kms
> _frontbuffer_tracking@fbcpsr-1p-primscrn-pri-indfb-draw-pwrite:
>     - shard-iclb:         [FAIL][85] ([fdo#103167]) -> [PASS][86] +1
> similar issue
>    [85]: 
> https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7426/shard-iclb8/igt@[e-mail]
>    [86]: 
> https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15445/shard-iclb3/igt@[e-mail]
> 
>   * igt@kms_frontbuffer_tracking@psr-shrfb-scaledprimary:
>     - shard-skl:          [INCOMPLETE][87] ([fdo#106978]) ->
> [PASS][88]
>    [87]: 
> https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7426/shard-skl6/igt@[e-mail]
>    [88]: 
> https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15445/shard-skl5/igt@[e-mail]
> 
>   * igt@kms_plane_alpha_blend@pipe-a-coverage-7efc:
>     - shard-skl:          [FAIL][89] ([fdo#108145]) -> [PASS][90]
>    [89]: 
> https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7426/shard-skl1/igt@[e-mail]
>    [90]: 
> https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15445/shard-skl4/igt@[e-mail]
> 
>   * igt@kms_setmode@basic:
>     - shard-apl:          [FAIL][91] ([fdo#99912]) -> [PASS][92]
>    [91]: 
> https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7426/shard-apl4/igt@[e-mail]
>    [92]: 
> https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15445/shard-apl7/igt@[e-mail]
> 
>   
> #### Warnings ####
> 
>   * igt@gem_ctx_isolation@vcs1-nonpriv:
>     - shard-iclb:         [SKIP][93] ([fdo#109276] / [fdo#112080]) ->
> [FAIL][94] ([fdo#111329])
>    [93]: 
> https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7426/shard-iclb3/igt@[e-mail]
>    [94]: 
> https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15445/shard-iclb2/igt@[e-mail]
> 
>   
>   [fdo#102670]: https://bugs.freedesktop.org/show_bug.cgi?id=102670
>   [fdo#103167]: https://bugs.freedesktop.org/show_bug.cgi?id=103167
>   [fdo#103355]: https://bugs.freedesktop.org/show_bug.cgi?id=103355
>   [fdo#103540]: https://bugs.freedesktop.org/show_bug.cgi?id=103540
>   [fdo#103665]: https://bugs.freedesktop.org/show_bug.cgi?id=103665
>   [fdo#104108]: https://bugs.freedesktop.org/show_bug.cgi?id=104108
>   [fdo#105363]: https://bugs.freedesktop.org/show_bug.cgi?id=105363
>   [fdo#105411]: https://bugs.freedesktop.org/show_bug.cgi?id=105411
>   [fdo#106107]: https://bugs.freedesktop.org/show_bug.cgi?id=106107
>   [fdo#106978]: https://bugs.freedesktop.org/show_bug.cgi?id=106978
>   [fdo#107713]: https://bugs.freedesktop.org/show_bug.cgi?id=107713
>   [fdo#107807]: https://bugs.freedesktop.org/show_bug.cgi?id=107807
>   [fdo#108145]: https://bugs.freedesktop.org/show_bug.cgi?id=108145
>   [fdo#108566]: https://bugs.freedesktop.org/show_bug.cgi?id=108566
>   [fdo#109271]: https://bugs.freedesktop.org/show_bug.cgi?id=109271
>   [fdo#109276]: https://bugs.freedesktop.org/show_bug.cgi?id=109276
>   [fdo#110403]: https://bugs.freedesktop.org/show_bug.cgi?id=110403
>   [fdo#111329]: https://bugs.freedesktop.org/show_bug.cgi?id=111329
>   [fdo#111606]: https://bugs.freedesktop.org/show
> 
> == Logs ==
> 
> For more details see: 
> https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15445/index.html

Matt Roper Nov. 28, 2019, 12:38 a.m. UTC | #2

On Mon, Nov 25, 2019 at 04:53:56PM -0800, José Roberto de Souza wrote:
> PSR2 HW only support a limited number of bits per pixel, if mode has
> more than supported PSR2 should not be enabled.
> 
> BSpec: 50422
> BSpec: 7713
> Cc: Gwan-gyeong Mun <[e-mail]>
> Cc: Matt Roper <[e-mail]>
> Reviewed-by: Lucas De Marchi <[e-mail]>
> Signed-off-by: José Roberto de Souza <[e-mail]>

Reviewed-by: Matt Roper <[e-mail]>

> ---
>  drivers/gpu/drm/i915/display/intel_psr.c | 11 ++++++++++-
>  1 file changed, 10 insertions(+), 1 deletion(-)
> 
> diff --git a/drivers/gpu/drm/i915/display/intel_psr.c b/drivers/gpu/drm/i915/display/intel_psr.c
> index c1d133362b76..0d84ea28bc6f 100644
> --- a/drivers/gpu/drm/i915/display/intel_psr.c
> +++ b/drivers/gpu/drm/i915/display/intel_psr.c
> @@ -608,7 +608,7 @@ static bool intel_psr2_config_valid(struct intel_dp *intel_dp,
>  	struct drm_i915_private *dev_priv = dp_to_i915(intel_dp);
>  	int crtc_hdisplay = crtc_state->hw.adjusted_mode.crtc_hdisplay;
>  	int crtc_vdisplay = crtc_state->hw.adjusted_mode.crtc_vdisplay;
> -	int psr_max_h = 0, psr_max_v = 0;
> +	int psr_max_h = 0, psr_max_v = 0, max_bpp = 0;
>  
>  	if (!dev_priv->psr.sink_psr2_support)
>  		return false;
> @@ -632,12 +632,15 @@ static bool intel_psr2_config_valid(struct intel_dp *intel_dp,
>  	if (INTEL_GEN(dev_priv) >= 12) {
>  		psr_max_h = 5120;
>  		psr_max_v = 3200;
> +		max_bpp = 30;
>  	} else if (INTEL_GEN(dev_priv) >= 10 || IS_GEMINILAKE(dev_priv)) {
>  		psr_max_h = 4096;
>  		psr_max_v = 2304;
> +		max_bpp = 24;
>  	} else if (IS_GEN(dev_priv, 9)) {
>  		psr_max_h = 3640;
>  		psr_max_v = 2304;
> +		max_bpp = 24;
>  	}
>  
>  	if (crtc_hdisplay > psr_max_h || crtc_vdisplay > psr_max_v) {
> @@ -647,6 +650,12 @@ static bool intel_psr2_config_valid(struct intel_dp *intel_dp,
>  		return false;
>  	}
>  
> +	if (crtc_state->pipe_bpp > max_bpp) {
> +		DRM_DEBUG_KMS("PSR2 not enabled, pipe bpp %d > max supported %d\n",
> +			      crtc_state->pipe_bpp, max_bpp);
> +		return false;
> +	}
> +
>  	/*
>  	 * HW sends SU blocks of size four scan lines, which means the starting
>  	 * X coordinate and Y granularity requirements will always be met. We
> -- 
> 2.24.0
>

Patch

diff --git a/drivers/gpu/drm/i915/display/intel_psr.c b/drivers/gpu/drm/i915/display/intel_psr.c
index c1d133362b76..0d84ea28bc6f 100644
--- a/drivers/gpu/drm/i915/display/intel_psr.c
+++ b/drivers/gpu/drm/i915/display/intel_psr.c
@@ -608,7 +608,7 @@  static bool intel_psr2_config_valid(struct intel_dp *intel_dp,
 	struct drm_i915_private *dev_priv = dp_to_i915(intel_dp);
 	int crtc_hdisplay = crtc_state->hw.adjusted_mode.crtc_hdisplay;
 	int crtc_vdisplay = crtc_state->hw.adjusted_mode.crtc_vdisplay;
-	int psr_max_h = 0, psr_max_v = 0;
+	int psr_max_h = 0, psr_max_v = 0, max_bpp = 0;
 
 	if (!dev_priv->psr.sink_psr2_support)
 		return false;
@@ -632,12 +632,15 @@  static bool intel_psr2_config_valid(struct intel_dp *intel_dp,
 	if (INTEL_GEN(dev_priv) >= 12) {
 		psr_max_h = 5120;
 		psr_max_v = 3200;
+		max_bpp = 30;
 	} else if (INTEL_GEN(dev_priv) >= 10 || IS_GEMINILAKE(dev_priv)) {
 		psr_max_h = 4096;
 		psr_max_v = 2304;
+		max_bpp = 24;
 	} else if (IS_GEN(dev_priv, 9)) {
 		psr_max_h = 3640;
 		psr_max_v = 2304;
+		max_bpp = 24;
 	}
 
 	if (crtc_hdisplay > psr_max_h || crtc_vdisplay > psr_max_v) {
@@ -647,6 +650,12 @@  static bool intel_psr2_config_valid(struct intel_dp *intel_dp,
 		return false;
 	}
 
+	if (crtc_state->pipe_bpp > max_bpp) {
+		DRM_DEBUG_KMS("PSR2 not enabled, pipe bpp %d > max supported %d\n",
+			      crtc_state->pipe_bpp, max_bpp);
+		return false;
+	}
+
 	/*
 	 * HW sends SU blocks of size four scan lines, which means the starting
 	 * X coordinate and Y granularity requirements will always be met. We