* [Intel-gfx] [PATCH] drm/i915: Implement UHBR bandwidth check
@ 2023-01-13 13:06 Stanislav Lisovskiy
2023-01-13 14:35 ` [Intel-gfx] ✓ Fi.CI.BAT: success for " Patchwork
` (2 more replies)
0 siblings, 3 replies; 9+ messages in thread
From: Stanislav Lisovskiy @ 2023-01-13 13:06 UTC (permalink / raw)
To: intel-gfx
According to spec, we should check if output_bpp * pixel_rate is less
than DDI clock * 72, if UHBR is used.
HSDES: 1406899791
BSPEC: 49259
v2: - Removed wrong comment(Rodrigo Vivi)
- Added HSDES to the commit msg(Rodrigo Vivi)
- Moved UHBR check to the MST specific code
v3: - Changed commit subject(Rodrigo Vivi)
- Fixed the error message if check fails(Rodrigo Vivi)
Signed-off-by: Stanislav Lisovskiy <stanislav.lisovskiy@intel.com>
Reviewed-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
---
drivers/gpu/drm/i915/display/intel_dp_mst.c | 16 +++++++++++++---
1 file changed, 13 insertions(+), 3 deletions(-)
diff --git a/drivers/gpu/drm/i915/display/intel_dp_mst.c b/drivers/gpu/drm/i915/display/intel_dp_mst.c
index 8b0e4defa3f1..36e368995bef 100644
--- a/drivers/gpu/drm/i915/display/intel_dp_mst.c
+++ b/drivers/gpu/drm/i915/display/intel_dp_mst.c
@@ -339,10 +339,20 @@ static int intel_dp_mst_compute_config(struct intel_encoder *encoder,
ret = intel_dp_dsc_compute_config(intel_dp, pipe_config,
conn_state, &limits,
pipe_config->dp_m_n.tu, false);
- }
+ if (ret < 0)
+ return ret;
- if (ret)
- return ret;
+ if (intel_dp_is_uhbr(pipe_config)) {
+ int output_bpp = pipe_config->dsc.compressed_bpp;
+
+ if (output_bpp * adjusted_mode->crtc_clock >=
+ pipe_config->port_clock * 72) {
+ drm_dbg_kms(&dev_priv->drm, "UHBR check failed(required bw %d available %d)\n",
+ output_bpp * adjusted_mode->crtc_clock, pipe_config->port_clock * 72);
+ return -EINVAL;
+ }
+ }
+ }
ret = intel_dp_mst_update_slots(encoder, pipe_config, conn_state);
if (ret)
--
2.37.3
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [Intel-gfx] ✓ Fi.CI.BAT: success for drm/i915: Implement UHBR bandwidth check
2023-01-13 13:06 [Intel-gfx] [PATCH] drm/i915: Implement UHBR bandwidth check Stanislav Lisovskiy
@ 2023-01-13 14:35 ` Patchwork
2023-01-13 14:43 ` [Intel-gfx] [PATCH] " Ville Syrjälä
2023-01-13 22:43 ` [Intel-gfx] ✓ Fi.CI.IGT: success for " Patchwork
2 siblings, 0 replies; 9+ messages in thread
From: Patchwork @ 2023-01-13 14:35 UTC (permalink / raw)
To: Stanislav Lisovskiy; +Cc: intel-gfx
[-- Attachment #1: Type: text/plain, Size: 2897 bytes --]
== Series Details ==
Series: drm/i915: Implement UHBR bandwidth check
URL : https://patchwork.freedesktop.org/series/112806/
State : success
== Summary ==
CI Bug Log - changes from CI_DRM_12582 -> Patchwork_112806v1
====================================================
Summary
-------
**SUCCESS**
No regressions found.
External URL: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_112806v1/index.html
Participating hosts (44 -> 43)
------------------------------
Missing (1): fi-snb-2520m
Known issues
------------
Here are the changes found in Patchwork_112806v1 that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@kms_pipe_crc_basic@suspend-read-crc:
- fi-bsw-nick: NOTRUN -> [SKIP][1] ([fdo#109271]) +1 similar issue
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_112806v1/fi-bsw-nick/igt@kms_pipe_crc_basic@suspend-read-crc.html
#### Possible fixes ####
* igt@i915_selftest@live@execlists:
- fi-bsw-nick: [INCOMPLETE][2] -> [PASS][3]
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12582/fi-bsw-nick/igt@i915_selftest@live@execlists.html
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_112806v1/fi-bsw-nick/igt@i915_selftest@live@execlists.html
* igt@i915_selftest@live@migrate:
- {bat-adlp-6}: [DMESG-FAIL][4] ([i915#7699]) -> [PASS][5]
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12582/bat-adlp-6/igt@i915_selftest@live@migrate.html
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_112806v1/bat-adlp-6/igt@i915_selftest@live@migrate.html
{name}: This element is suppressed. This means it is ignored when computing
the status of the difference (SUCCESS, WARNING, or FAILURE).
[fdo#109271]: https://bugs.freedesktop.org/show_bug.cgi?id=109271
[i915#4258]: https://gitlab.freedesktop.org/drm/intel/issues/4258
[i915#4312]: https://gitlab.freedesktop.org/drm/intel/issues/4312
[i915#4983]: https://gitlab.freedesktop.org/drm/intel/issues/4983
[i915#5354]: https://gitlab.freedesktop.org/drm/intel/issues/5354
[i915#7359]: https://gitlab.freedesktop.org/drm/intel/issues/7359
[i915#7625]: https://gitlab.freedesktop.org/drm/intel/issues/7625
[i915#7699]: https://gitlab.freedesktop.org/drm/intel/issues/7699
Build changes
-------------
* Linux: CI_DRM_12582 -> Patchwork_112806v1
CI-20190529: 20190529
CI_DRM_12582: 312e96256f0520b8660750dd4fc937f63c2f359e @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_7119: 1e6d24e6dfa42b22f950f7d5e436b8f9acf8747f @ https://gitlab.freedesktop.org/drm/igt-gpu-tools.git
Patchwork_112806v1: 312e96256f0520b8660750dd4fc937f63c2f359e @ git://anongit.freedesktop.org/gfx-ci/linux
### Linux commits
4a2ff9e802c2 drm/i915: Implement UHBR bandwidth check
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_112806v1/index.html
[-- Attachment #2: Type: text/html, Size: 3159 bytes --]
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [Intel-gfx] [PATCH] drm/i915: Implement UHBR bandwidth check
2023-01-13 13:06 [Intel-gfx] [PATCH] drm/i915: Implement UHBR bandwidth check Stanislav Lisovskiy
2023-01-13 14:35 ` [Intel-gfx] ✓ Fi.CI.BAT: success for " Patchwork
@ 2023-01-13 14:43 ` Ville Syrjälä
2023-01-16 7:51 ` Lisovskiy, Stanislav
2023-01-13 22:43 ` [Intel-gfx] ✓ Fi.CI.IGT: success for " Patchwork
2 siblings, 1 reply; 9+ messages in thread
From: Ville Syrjälä @ 2023-01-13 14:43 UTC (permalink / raw)
To: Stanislav Lisovskiy; +Cc: intel-gfx
On Fri, Jan 13, 2023 at 03:06:28PM +0200, Stanislav Lisovskiy wrote:
> According to spec, we should check if output_bpp * pixel_rate is less
> than DDI clock * 72, if UHBR is used.
>
> HSDES: 1406899791
> BSPEC: 49259
>
> v2: - Removed wrong comment(Rodrigo Vivi)
> - Added HSDES to the commit msg(Rodrigo Vivi)
> - Moved UHBR check to the MST specific code
>
> v3: - Changed commit subject(Rodrigo Vivi)
> - Fixed the error message if check fails(Rodrigo Vivi)
>
> Signed-off-by: Stanislav Lisovskiy <stanislav.lisovskiy@intel.com>
> Reviewed-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
> ---
> drivers/gpu/drm/i915/display/intel_dp_mst.c | 16 +++++++++++++---
> 1 file changed, 13 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/display/intel_dp_mst.c b/drivers/gpu/drm/i915/display/intel_dp_mst.c
> index 8b0e4defa3f1..36e368995bef 100644
> --- a/drivers/gpu/drm/i915/display/intel_dp_mst.c
> +++ b/drivers/gpu/drm/i915/display/intel_dp_mst.c
> @@ -339,10 +339,20 @@ static int intel_dp_mst_compute_config(struct intel_encoder *encoder,
> ret = intel_dp_dsc_compute_config(intel_dp, pipe_config,
> conn_state, &limits,
> pipe_config->dp_m_n.tu, false);
> - }
> + if (ret < 0)
> + return ret;
>
> - if (ret)
> - return ret;
> + if (intel_dp_is_uhbr(pipe_config)) {
> + int output_bpp = pipe_config->dsc.compressed_bpp;
> +
> + if (output_bpp * adjusted_mode->crtc_clock >=
> + pipe_config->port_clock * 72) {
> + drm_dbg_kms(&dev_priv->drm, "UHBR check failed(required bw %d available %d)\n",
> + output_bpp * adjusted_mode->crtc_clock, pipe_config->port_clock * 72);
> + return -EINVAL;
Doesn't this just mean the user can never enable this particular
mode? Would seem more sensible to account for the extra
limitation when we determine port_clock and/or compressed_bpp.
> + }
> + }
> + }
>
> ret = intel_dp_mst_update_slots(encoder, pipe_config, conn_state);
> if (ret)
> --
> 2.37.3
--
Ville Syrjälä
Intel
^ permalink raw reply [flat|nested] 9+ messages in thread
* [Intel-gfx] ✓ Fi.CI.IGT: success for drm/i915: Implement UHBR bandwidth check
2023-01-13 13:06 [Intel-gfx] [PATCH] drm/i915: Implement UHBR bandwidth check Stanislav Lisovskiy
2023-01-13 14:35 ` [Intel-gfx] ✓ Fi.CI.BAT: success for " Patchwork
2023-01-13 14:43 ` [Intel-gfx] [PATCH] " Ville Syrjälä
@ 2023-01-13 22:43 ` Patchwork
2 siblings, 0 replies; 9+ messages in thread
From: Patchwork @ 2023-01-13 22:43 UTC (permalink / raw)
To: Stanislav Lisovskiy; +Cc: intel-gfx
[-- Attachment #1: Type: text/plain, Size: 19262 bytes --]
== Series Details ==
Series: drm/i915: Implement UHBR bandwidth check
URL : https://patchwork.freedesktop.org/series/112806/
State : success
== Summary ==
CI Bug Log - changes from CI_DRM_12582_full -> Patchwork_112806v1_full
====================================================
Summary
-------
**SUCCESS**
No regressions found.
External URL: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_112806v1/index.html
Participating hosts (12 -> 10)
------------------------------
Additional (1): shard-rkl0
Missing (3): pig-skl-6260u pig-kbl-iris pig-glk-j5005
Known issues
------------
Here are the changes found in Patchwork_112806v1_full that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@gen9_exec_parse@allowed-single:
- shard-glk: [PASS][1] -> [DMESG-WARN][2] ([i915#5566] / [i915#716])
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12582/shard-glk8/igt@gen9_exec_parse@allowed-single.html
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_112806v1/shard-glk4/igt@gen9_exec_parse@allowed-single.html
* igt@kms_ccs@pipe-c-random-ccs-data-y_tiled_ccs:
- shard-glk: NOTRUN -> [SKIP][3] ([fdo#109271]) +5 similar issues
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_112806v1/shard-glk8/igt@kms_ccs@pipe-c-random-ccs-data-y_tiled_ccs.html
* igt@kms_flip@2x-flip-vs-expired-vblank-interruptible@bc-hdmi-a1-hdmi-a2:
- shard-glk: [PASS][4] -> [FAIL][5] ([i915#79]) +1 similar issue
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12582/shard-glk6/igt@kms_flip@2x-flip-vs-expired-vblank-interruptible@bc-hdmi-a1-hdmi-a2.html
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_112806v1/shard-glk7/igt@kms_flip@2x-flip-vs-expired-vblank-interruptible@bc-hdmi-a1-hdmi-a2.html
* igt@runner@aborted:
- shard-glk: NOTRUN -> [FAIL][6] ([i915#4312])
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_112806v1/shard-glk4/igt@runner@aborted.html
#### Possible fixes ####
* igt@fbdev@write:
- {shard-dg1}: [FAIL][7] ([i915#7863]) -> [PASS][8]
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12582/shard-dg1-16/igt@fbdev@write.html
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_112806v1/shard-dg1-19/igt@fbdev@write.html
* igt@gem_eio@in-flight-suspend:
- {shard-rkl}: [FAIL][9] ([fdo#103375]) -> [PASS][10] +1 similar issue
[9]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12582/shard-rkl-4/igt@gem_eio@in-flight-suspend.html
[10]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_112806v1/shard-rkl-5/igt@gem_eio@in-flight-suspend.html
* igt@gem_exec_reloc@basic-gtt-wc-noreloc:
- {shard-rkl}: [SKIP][11] ([i915#3281]) -> [PASS][12] +5 similar issues
[11]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12582/shard-rkl-2/igt@gem_exec_reloc@basic-gtt-wc-noreloc.html
[12]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_112806v1/shard-rkl-5/igt@gem_exec_reloc@basic-gtt-wc-noreloc.html
* igt@gem_ppgtt@flink-and-close-vma-leak:
- shard-glk: [FAIL][13] -> [PASS][14]
[13]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12582/shard-glk1/igt@gem_ppgtt@flink-and-close-vma-leak.html
[14]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_112806v1/shard-glk8/igt@gem_ppgtt@flink-and-close-vma-leak.html
* igt@gem_pread@display:
- {shard-rkl}: [SKIP][15] ([i915#3282]) -> [PASS][16]
[15]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12582/shard-rkl-2/igt@gem_pread@display.html
[16]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_112806v1/shard-rkl-5/igt@gem_pread@display.html
* igt@gen9_exec_parse@basic-rejected-ctx-param:
- {shard-rkl}: [SKIP][17] ([i915#2527]) -> [PASS][18] +1 similar issue
[17]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12582/shard-rkl-4/igt@gen9_exec_parse@basic-rejected-ctx-param.html
[18]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_112806v1/shard-rkl-5/igt@gen9_exec_parse@basic-rejected-ctx-param.html
* igt@i915_pipe_stress@stress-xrgb8888-ytiled:
- {shard-rkl}: [SKIP][19] ([i915#4098]) -> [PASS][20]
[19]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12582/shard-rkl-5/igt@i915_pipe_stress@stress-xrgb8888-ytiled.html
[20]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_112806v1/shard-rkl-6/igt@i915_pipe_stress@stress-xrgb8888-ytiled.html
* igt@i915_pm_dc@dc9-dpms:
- {shard-tglu}: [SKIP][21] ([i915#4281]) -> [PASS][22]
[21]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12582/shard-tglu-1/igt@i915_pm_dc@dc9-dpms.html
[22]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_112806v1/shard-tglu-2/igt@i915_pm_dc@dc9-dpms.html
* igt@i915_pm_lpsp@kms-lpsp@kms-lpsp-hdmi-a:
- {shard-dg1}: [SKIP][23] ([i915#1937]) -> [PASS][24]
[23]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12582/shard-dg1-18/igt@i915_pm_lpsp@kms-lpsp@kms-lpsp-hdmi-a.html
[24]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_112806v1/shard-dg1-14/igt@i915_pm_lpsp@kms-lpsp@kms-lpsp-hdmi-a.html
* igt@i915_pm_rc6_residency@rc6-idle@rcs0:
- {shard-dg1}: [FAIL][25] ([i915#3591]) -> [PASS][26]
[25]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12582/shard-dg1-18/igt@i915_pm_rc6_residency@rc6-idle@rcs0.html
[26]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_112806v1/shard-dg1-19/igt@i915_pm_rc6_residency@rc6-idle@rcs0.html
* igt@i915_pm_rpm@dpms-lpsp:
- {shard-dg1}: [SKIP][27] ([i915#1397]) -> [PASS][28] +1 similar issue
[27]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12582/shard-dg1-15/igt@i915_pm_rpm@dpms-lpsp.html
[28]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_112806v1/shard-dg1-14/igt@i915_pm_rpm@dpms-lpsp.html
* igt@i915_pm_rpm@pm-tiling:
- {shard-rkl}: [SKIP][29] ([fdo#109308]) -> [PASS][30]
[29]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12582/shard-rkl-5/igt@i915_pm_rpm@pm-tiling.html
[30]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_112806v1/shard-rkl-6/igt@i915_pm_rpm@pm-tiling.html
* igt@i915_pm_sseu@full-enable:
- {shard-rkl}: [SKIP][31] ([i915#4387]) -> [PASS][32]
[31]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12582/shard-rkl-2/igt@i915_pm_sseu@full-enable.html
[32]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_112806v1/shard-rkl-5/igt@i915_pm_sseu@full-enable.html
* igt@kms_cursor_legacy@flip-vs-cursor@atomic-transitions-varying-size:
- shard-glk: [FAIL][33] ([i915#2346]) -> [PASS][34] +1 similar issue
[33]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12582/shard-glk2/igt@kms_cursor_legacy@flip-vs-cursor@atomic-transitions-varying-size.html
[34]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_112806v1/shard-glk5/igt@kms_cursor_legacy@flip-vs-cursor@atomic-transitions-varying-size.html
* igt@kms_flip@flip-vs-expired-vblank@a-hdmi-a1:
- shard-glk: [FAIL][35] ([i915#79]) -> [PASS][36]
[35]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12582/shard-glk1/igt@kms_flip@flip-vs-expired-vblank@a-hdmi-a1.html
[36]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_112806v1/shard-glk9/igt@kms_flip@flip-vs-expired-vblank@a-hdmi-a1.html
* igt@kms_frontbuffer_tracking@fbc-1p-primscrn-pri-shrfb-draw-render:
- {shard-rkl}: [SKIP][37] ([i915#1849] / [i915#4098]) -> [PASS][38] +7 similar issues
[37]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12582/shard-rkl-5/igt@kms_frontbuffer_tracking@fbc-1p-primscrn-pri-shrfb-draw-render.html
[38]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_112806v1/shard-rkl-6/igt@kms_frontbuffer_tracking@fbc-1p-primscrn-pri-shrfb-draw-render.html
* igt@kms_hdmi_inject@inject-audio:
- {shard-rkl}: [SKIP][39] ([i915#433]) -> [PASS][40]
[39]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12582/shard-rkl-3/igt@kms_hdmi_inject@inject-audio.html
[40]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_112806v1/shard-rkl-1/igt@kms_hdmi_inject@inject-audio.html
* igt@kms_psr@sprite_render:
- {shard-rkl}: [SKIP][41] ([i915#1072]) -> [PASS][42]
[41]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12582/shard-rkl-5/igt@kms_psr@sprite_render.html
[42]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_112806v1/shard-rkl-6/igt@kms_psr@sprite_render.html
* igt@kms_universal_plane@disable-primary-vs-flip-pipe-b:
- {shard-rkl}: [SKIP][43] ([i915#1845] / [i915#4098]) -> [PASS][44] +4 similar issues
[43]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12582/shard-rkl-5/igt@kms_universal_plane@disable-primary-vs-flip-pipe-b.html
[44]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_112806v1/shard-rkl-6/igt@kms_universal_plane@disable-primary-vs-flip-pipe-b.html
* igt@perf@gen8-unprivileged-single-ctx-counters:
- {shard-rkl}: [SKIP][45] ([i915#2436]) -> [PASS][46]
[45]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12582/shard-rkl-4/igt@perf@gen8-unprivileged-single-ctx-counters.html
[46]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_112806v1/shard-rkl-5/igt@perf@gen8-unprivileged-single-ctx-counters.html
* igt@perf@polling-small-buf:
- {shard-rkl}: [FAIL][47] ([i915#1722]) -> [PASS][48]
[47]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12582/shard-rkl-4/igt@perf@polling-small-buf.html
[48]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_112806v1/shard-rkl-5/igt@perf@polling-small-buf.html
* igt@sysfs_timeslice_duration@timeout@rcs0:
- {shard-dg1}: [FAIL][49] ([i915#1755]) -> [PASS][50] +1 similar issue
[49]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12582/shard-dg1-12/igt@sysfs_timeslice_duration@timeout@rcs0.html
[50]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_112806v1/shard-dg1-15/igt@sysfs_timeslice_duration@timeout@rcs0.html
{name}: This element is suppressed. This means it is ignored when computing
the status of the difference (SUCCESS, WARNING, or FAILURE).
[fdo#103375]: https://bugs.freedesktop.org/show_bug.cgi?id=103375
[fdo#109271]: https://bugs.freedesktop.org/show_bug.cgi?id=109271
[fdo#109274]: https://bugs.freedesktop.org/show_bug.cgi?id=109274
[fdo#109279]: https://bugs.freedesktop.org/show_bug.cgi?id=109279
[fdo#109280]: https://bugs.freedesktop.org/show_bug.cgi?id=109280
[fdo#109283]: https://bugs.freedesktop.org/show_bug.cgi?id=109283
[fdo#109289]: https://bugs.freedesktop.org/show_bug.cgi?id=109289
[fdo#109295]: https://bugs.freedesktop.org/show_bug.cgi?id=109295
[fdo#109308]: https://bugs.freedesktop.org/show_bug.cgi?id=109308
[fdo#109315]: https://bugs.freedesktop.org/show_bug.cgi?id=109315
[fdo#109506]: https://bugs.freedesktop.org/show_bug.cgi?id=109506
[fdo#110189]: https://bugs.freedesktop.org/show_bug.cgi?id=110189
[fdo#110723]: https://bugs.freedesktop.org/show_bug.cgi?id=110723
[fdo#111068]: https://bugs.freedesktop.org/show_bug.cgi?id=111068
[fdo#111614]: https://bugs.freedesktop.org/show_bug.cgi?id=111614
[fdo#111615]: https://bugs.freedesktop.org/show_bug.cgi?id=111615
[fdo#111644]: https://bugs.freedesktop.org/show_bug.cgi?id=111644
[fdo#111656]: https://bugs.freedesktop.org/show_bug.cgi?id=111656
[fdo#111825]: https://bugs.freedesktop.org/show_bug.cgi?id=111825
[fdo#111827]: https://bugs.freedesktop.org/show_bug.cgi?id=111827
[fdo#112054]: https://bugs.freedesktop.org/show_bug.cgi?id=112054
[fdo#112283]: https://bugs.freedesktop.org/show_bug.cgi?id=112283
[i915#1072]: https://gitlab.freedesktop.org/drm/intel/issues/1072
[i915#132]: https://gitlab.freedesktop.org/drm/intel/issues/132
[i915#1397]: https://gitlab.freedesktop.org/drm/intel/issues/1397
[i915#1722]: https://gitlab.freedesktop.org/drm/intel/issues/1722
[i915#1755]: https://gitlab.freedesktop.org/drm/intel/issues/1755
[i915#1769]: https://gitlab.freedesktop.org/drm/intel/issues/1769
[i915#1825]: https://gitlab.freedesktop.org/drm/intel/issues/1825
[i915#1839]: https://gitlab.freedesktop.org/drm/intel/issues/1839
[i915#1845]: https://gitlab.freedesktop.org/drm/intel/issues/1845
[i915#1849]: https://gitlab.freedesktop.org/drm/intel/issues/1849
[i915#1937]: https://gitlab.freedesktop.org/drm/intel/issues/1937
[i915#2190]: https://gitlab.freedesktop.org/drm/intel/issues/2190
[i915#2346]: https://gitlab.freedesktop.org/drm/intel/issues/2346
[i915#2436]: https://gitlab.freedesktop.org/drm/intel/issues/2436
[i915#2437]: https://gitlab.freedesktop.org/drm/intel/issues/2437
[i915#2527]: https://gitlab.freedesktop.org/drm/intel/issues/2527
[i915#2575]: https://gitlab.freedesktop.org/drm/intel/issues/2575
[i915#2582]: https://gitlab.freedesktop.org/drm/intel/issues/2582
[i915#2587]: https://gitlab.freedesktop.org/drm/intel/issues/2587
[i915#2672]: https://gitlab.freedesktop.org/drm/intel/issues/2672
[i915#2681]: https://gitlab.freedesktop.org/drm/intel/issues/2681
[i915#280]: https://gitlab.freedesktop.org/drm/intel/issues/280
[i915#2842]: https://gitlab.freedesktop.org/drm/intel/issues/2842
[i915#2856]: https://gitlab.freedesktop.org/drm/intel/issues/2856
[i915#2920]: https://gitlab.freedesktop.org/drm/intel/issues/2920
[i915#2994]: https://gitlab.freedesktop.org/drm/intel/issues/2994
[i915#3116]: https://gitlab.freedesktop.org/drm/intel/issues/3116
[i915#315]: https://gitlab.freedesktop.org/drm/intel/issues/315
[i915#3281]: https://gitlab.freedesktop.org/drm/intel/issues/3281
[i915#3282]: https://gitlab.freedesktop.org/drm/intel/issues/3282
[i915#3291]: https://gitlab.freedesktop.org/drm/intel/issues/3291
[i915#3297]: https://gitlab.freedesktop.org/drm/intel/issues/3297
[i915#3299]: https://gitlab.freedesktop.org/drm/intel/issues/3299
[i915#3359]: https://gitlab.freedesktop.org/drm/intel/issues/3359
[i915#3528]: https://gitlab.freedesktop.org/drm/intel/issues/3528
[i915#3546]: https://gitlab.freedesktop.org/drm/intel/issues/3546
[i915#3555]: https://gitlab.freedesktop.org/drm/intel/issues/3555
[i915#3591]: https://gitlab.freedesktop.org/drm/intel/issues/3591
[i915#3637]: https://gitlab.freedesktop.org/drm/intel/issues/3637
[i915#3638]: https://gitlab.freedesktop.org/drm/intel/issues/3638
[i915#3689]: https://gitlab.freedesktop.org/drm/intel/issues/3689
[i915#3708]: https://gitlab.freedesktop.org/drm/intel/issues/3708
[i915#3734]: https://gitlab.freedesktop.org/drm/intel/issues/3734
[i915#3742]: https://gitlab.freedesktop.org/drm/intel/issues/3742
[i915#3826]: https://gitlab.freedesktop.org/drm/intel/issues/3826
[i915#3886]: https://gitlab.freedesktop.org/drm/intel/issues/3886
[i915#3955]: https://gitlab.freedesktop.org/drm/intel/issues/3955
[i915#404]: https://gitlab.freedesktop.org/drm/intel/issues/404
[i915#4070]: https://gitlab.freedesktop.org/drm/intel/issues/4070
[i915#4078]: https://gitlab.freedesktop.org/drm/intel/issues/4078
[i915#4098]: https://gitlab.freedesktop.org/drm/intel/issues/4098
[i915#4103]: https://gitlab.freedesktop.org/drm/intel/issues/4103
[i915#4270]: https://gitlab.freedesktop.org/drm/intel/issues/4270
[i915#4281]: https://gitlab.freedesktop.org/drm/intel/issues/4281
[i915#4312]: https://gitlab.freedesktop.org/drm/intel/issues/4312
[i915#433]: https://gitlab.freedesktop.org/drm/intel/issues/433
[i915#4349]: https://gitlab.freedesktop.org/drm/intel/issues/4349
[i915#4387]: https://gitlab.freedesktop.org/drm/intel/issues/4387
[i915#4613]: https://gitlab.freedesktop.org/drm/intel/issues/4613
[i915#4767]: https://gitlab.freedesktop.org/drm/intel/issues/4767
[i915#4877]: https://gitlab.freedesktop.org/drm/intel/issues/4877
[i915#5176]: https://gitlab.freedesktop.org/drm/intel/issues/5176
[i915#5235]: https://gitlab.freedesktop.org/drm/intel/issues/5235
[i915#5286]: https://gitlab.freedesktop.org/drm/intel/issues/5286
[i915#5288]: https://gitlab.freedesktop.org/drm/intel/issues/5288
[i915#5289]: https://gitlab.freedesktop.org/drm/intel/issues/5289
[i915#5325]: https://gitlab.freedesktop.org/drm/intel/issues/5325
[i915#5327]: https://gitlab.freedesktop.org/drm/intel/issues/5327
[i915#533]: https://gitlab.freedesktop.org/drm/intel/issues/533
[i915#5461]: https://gitlab.freedesktop.org/drm/intel/issues/5461
[i915#5566]: https://gitlab.freedesktop.org/drm/intel/issues/5566
[i915#6095]: https://gitlab.freedesktop.org/drm/intel/issues/6095
[i915#6117]: https://gitlab.freedesktop.org/drm/intel/issues/6117
[i915#6227]: https://gitlab.freedesktop.org/drm/intel/issues/6227
[i915#6245]: https://gitlab.freedesktop.org/drm/intel/issues/6245
[i915#6247]: https://gitlab.freedesktop.org/drm/intel/issues/6247
[i915#6248]: https://gitlab.freedesktop.org/drm/intel/issues/6248
[i915#6334]: https://gitlab.freedesktop.org/drm/intel/issues/6334
[i915#6344]: https://gitlab.freedesktop.org/drm/intel/issues/6344
[i915#6355]: https://gitlab.freedesktop.org/drm/intel/issues/6355
[i915#6433]: https://gitlab.freedesktop.org/drm/intel/issues/6433
[i915#6497]: https://gitlab.freedesktop.org/drm/intel/issues/6497
[i915#6524]: https://gitlab.freedesktop.org/drm/intel/issues/6524
[i915#658]: https://gitlab.freedesktop.org/drm/intel/issues/658
[i915#6768]: https://gitlab.freedesktop.org/drm/intel/issues/6768
[i915#6944]: https://gitlab.freedesktop.org/drm/intel/issues/6944
[i915#6946]: https://gitlab.freedesktop.org/drm/intel/issues/6946
[i915#6953]: https://gitlab.freedesktop.org/drm/intel/issues/6953
[i915#7037]: https://gitlab.freedesktop.org/drm/intel/issues/7037
[i915#7116]: https://gitlab.freedesktop.org/drm/intel/issues/7116
[i915#7118]: https://gitlab.freedesktop.org/drm/intel/issues/7118
[i915#7128]: https://gitlab.freedesktop.org/drm/intel/issues/7128
[i915#716]: https://gitlab.freedesktop.org/drm/intel/issues/716
[i915#7294]: https://gitlab.freedesktop.org/drm/intel/issues/7294
[i915#7443]: https://gitlab.freedesktop.org/drm/intel/issues/7443
[i915#7561]: https://gitlab.freedesktop.org/drm/intel/issues/7561
[i915#7651]: https://gitlab.freedesktop.org/drm/intel/issues/7651
[i915#7697]: https://gitlab.freedesktop.org/drm/intel/issues/7697
[i915#7701]: https://gitlab.freedesktop.org/drm/intel/issues/7701
[i915#7707]: https://gitlab.freedesktop.org/drm/intel/issues/7707
[i915#7742]: https://gitlab.freedesktop.org/drm/intel/issues/7742
[i915#7828]: https://gitlab.freedesktop.org/drm/intel/issues/7828
[i915#7863]: https://gitlab.freedesktop.org/drm/intel/issues/7863
[i915#79]: https://gitlab.freedesktop.org/drm/intel/issues/79
Build changes
-------------
* Linux: CI_DRM_12582 -> Patchwork_112806v1
* Piglit: piglit_4509 -> None
CI-20190529: 20190529
CI_DRM_12582: 312e96256f0520b8660750dd4fc937f63c2f359e @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_7119: 1e6d24e6dfa42b22f950f7d5e436b8f9acf8747f @ https://gitlab.freedesktop.org/drm/igt-gpu-tools.git
Patchwork_112806v1: 312e96256f0520b8660750dd4fc937f63c2f359e @ git://anongit.freedesktop.org/gfx-ci/linux
piglit_4509: fdc5a4ca11124ab8413c7988896eec4c97336694 @ git://anongit.freedesktop.org/piglit
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_112806v1/index.html
[-- Attachment #2: Type: text/html, Size: 13875 bytes --]
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [Intel-gfx] [PATCH] drm/i915: Implement UHBR bandwidth check
2023-01-13 14:43 ` [Intel-gfx] [PATCH] " Ville Syrjälä
@ 2023-01-16 7:51 ` Lisovskiy, Stanislav
0 siblings, 0 replies; 9+ messages in thread
From: Lisovskiy, Stanislav @ 2023-01-16 7:51 UTC (permalink / raw)
To: Ville Syrjälä; +Cc: intel-gfx
On Fri, Jan 13, 2023 at 04:43:54PM +0200, Ville Syrjälä wrote:
> On Fri, Jan 13, 2023 at 03:06:28PM +0200, Stanislav Lisovskiy wrote:
> > According to spec, we should check if output_bpp * pixel_rate is less
> > than DDI clock * 72, if UHBR is used.
> >
> > HSDES: 1406899791
> > BSPEC: 49259
> >
> > v2: - Removed wrong comment(Rodrigo Vivi)
> > - Added HSDES to the commit msg(Rodrigo Vivi)
> > - Moved UHBR check to the MST specific code
> >
> > v3: - Changed commit subject(Rodrigo Vivi)
> > - Fixed the error message if check fails(Rodrigo Vivi)
> >
> > Signed-off-by: Stanislav Lisovskiy <stanislav.lisovskiy@intel.com>
> > Reviewed-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
> > ---
> > drivers/gpu/drm/i915/display/intel_dp_mst.c | 16 +++++++++++++---
> > 1 file changed, 13 insertions(+), 3 deletions(-)
> >
> > diff --git a/drivers/gpu/drm/i915/display/intel_dp_mst.c b/drivers/gpu/drm/i915/display/intel_dp_mst.c
> > index 8b0e4defa3f1..36e368995bef 100644
> > --- a/drivers/gpu/drm/i915/display/intel_dp_mst.c
> > +++ b/drivers/gpu/drm/i915/display/intel_dp_mst.c
> > @@ -339,10 +339,20 @@ static int intel_dp_mst_compute_config(struct intel_encoder *encoder,
> > ret = intel_dp_dsc_compute_config(intel_dp, pipe_config,
> > conn_state, &limits,
> > pipe_config->dp_m_n.tu, false);
> > - }
> > + if (ret < 0)
> > + return ret;
> >
> > - if (ret)
> > - return ret;
> > + if (intel_dp_is_uhbr(pipe_config)) {
> > + int output_bpp = pipe_config->dsc.compressed_bpp;
> > +
> > + if (output_bpp * adjusted_mode->crtc_clock >=
> > + pipe_config->port_clock * 72) {
> > + drm_dbg_kms(&dev_priv->drm, "UHBR check failed(required bw %d available %d)\n",
> > + output_bpp * adjusted_mode->crtc_clock, pipe_config->port_clock * 72);
> > + return -EINVAL;
>
> Doesn't this just mean the user can never enable this particular
> mode? Would seem more sensible to account for the extra
> limitation when we determine port_clock and/or compressed_bpp.
So do you mean I should add this as part of the constraints, that we check, where we optimize
port_clock? probably also then if we fail to find uncompressed more for that,
then we need to try with DSC, also gradually decreasing compressed_bpp.
Stan
>
> > + }
> > + }
> > + }
> >
> > ret = intel_dp_mst_update_slots(encoder, pipe_config, conn_state);
> > if (ret)
> > --
> > 2.37.3
>
> --
> Ville Syrjälä
> Intel
^ permalink raw reply [flat|nested] 9+ messages in thread
* [Intel-gfx] [PATCH] drm/i915: Implement UHBR bandwidth check
@ 2023-02-27 11:20 Stanislav Lisovskiy
2023-03-09 12:54 ` Ville Syrjälä
0 siblings, 1 reply; 9+ messages in thread
From: Stanislav Lisovskiy @ 2023-02-27 11:20 UTC (permalink / raw)
To: intel-gfx; +Cc: jani.nikula
According to spec, we should check if output_bpp * pixel_rate is less
than DDI clock * 72, if UHBR is used.
v2: - s/pipe_config/crtc_state/ (Jani Nikula)
- Merged previous patch into that one, to remove empty function(Jani Nikula)
HSDES: 1406899791
BSPEC: 49259
Signed-off-by: Stanislav Lisovskiy <stanislav.lisovskiy@intel.com>
---
drivers/gpu/drm/i915/display/intel_dp_mst.c | 28 +++++++++++++++++++--
1 file changed, 26 insertions(+), 2 deletions(-)
diff --git a/drivers/gpu/drm/i915/display/intel_dp_mst.c b/drivers/gpu/drm/i915/display/intel_dp_mst.c
index a860cbc5dbea..d0e2e37cd758 100644
--- a/drivers/gpu/drm/i915/display/intel_dp_mst.c
+++ b/drivers/gpu/drm/i915/display/intel_dp_mst.c
@@ -45,6 +45,26 @@
#include "intel_hotplug.h"
#include "skl_scaler.h"
+static int intel_dp_mst_check_constraints(struct drm_i915_private *i915, int bpp,
+ const struct drm_display_mode *adjusted_mode,
+ struct intel_crtc_state *crtc_state)
+{
+ if (intel_dp_is_uhbr(crtc_state)) {
+ int output_bpp = bpp;
+ /* DisplayPort 2 128b/132b, bits per lane is always 32 */
+ int symbol_clock = crtc_state->port_clock / 32;
+
+ if (output_bpp * adjusted_mode->crtc_clock >=
+ symbol_clock * 72) {
+ drm_dbg_kms(&i915->drm, "UHBR check failed(required bw %d available %d)\n",
+ output_bpp * adjusted_mode->crtc_clock, symbol_clock * 72);
+ return -EINVAL;
+ }
+ }
+
+ return 0;
+}
+
static int intel_dp_mst_find_vcpi_slots_for_bpp(struct intel_encoder *encoder,
struct intel_crtc_state *crtc_state,
int max_bpp,
@@ -87,6 +107,10 @@ static int intel_dp_mst_find_vcpi_slots_for_bpp(struct intel_encoder *encoder,
drm_dbg_kms(&i915->drm, "Trying bpp %d\n", bpp);
+ ret = intel_dp_mst_check_constraints(i915, bpp, adjusted_mode, crtc_state);
+ if (ret)
+ continue;
+
slots = drm_dp_atomic_find_time_slots(state, &intel_dp->mst_mgr,
connector->port,
crtc_state->pbn);
@@ -104,8 +128,8 @@ static int intel_dp_mst_find_vcpi_slots_for_bpp(struct intel_encoder *encoder,
}
}
- /* Despite slots are non-zero, we still failed the atomic check */
- if (ret && slots >= 0)
+ /* We failed to find a proper bpp/timeslots, return error */
+ if (ret)
slots = ret;
if (slots < 0) {
--
2.37.3
^ permalink raw reply related [flat|nested] 9+ messages in thread
* Re: [Intel-gfx] [PATCH] drm/i915: Implement UHBR bandwidth check
2023-02-27 11:20 [Intel-gfx] [PATCH] " Stanislav Lisovskiy
@ 2023-03-09 12:54 ` Ville Syrjälä
0 siblings, 0 replies; 9+ messages in thread
From: Ville Syrjälä @ 2023-03-09 12:54 UTC (permalink / raw)
To: Stanislav Lisovskiy; +Cc: jani.nikula, intel-gfx
On Mon, Feb 27, 2023 at 01:20:30PM +0200, Stanislav Lisovskiy wrote:
> According to spec, we should check if output_bpp * pixel_rate is less
> than DDI clock * 72, if UHBR is used.
>
> v2: - s/pipe_config/crtc_state/ (Jani Nikula)
> - Merged previous patch into that one, to remove empty function(Jani Nikula)
>
> HSDES: 1406899791
> BSPEC: 49259
>
> Signed-off-by: Stanislav Lisovskiy <stanislav.lisovskiy@intel.com>
> ---
> drivers/gpu/drm/i915/display/intel_dp_mst.c | 28 +++++++++++++++++++--
> 1 file changed, 26 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/display/intel_dp_mst.c b/drivers/gpu/drm/i915/display/intel_dp_mst.c
> index a860cbc5dbea..d0e2e37cd758 100644
> --- a/drivers/gpu/drm/i915/display/intel_dp_mst.c
> +++ b/drivers/gpu/drm/i915/display/intel_dp_mst.c
> @@ -45,6 +45,26 @@
> #include "intel_hotplug.h"
> #include "skl_scaler.h"
>
> +static int intel_dp_mst_check_constraints(struct drm_i915_private *i915, int bpp,
> + const struct drm_display_mode *adjusted_mode,
> + struct intel_crtc_state *crtc_state)
> +{
> + if (intel_dp_is_uhbr(crtc_state)) {
> + int output_bpp = bpp;
> + /* DisplayPort 2 128b/132b, bits per lane is always 32 */
> + int symbol_clock = crtc_state->port_clock / 32;
> +
> + if (output_bpp * adjusted_mode->crtc_clock >=
> + symbol_clock * 72) {
> + drm_dbg_kms(&i915->drm, "UHBR check failed(required bw %d available %d)\n",
> + output_bpp * adjusted_mode->crtc_clock, symbol_clock * 72);
> + return -EINVAL;
> + }
You're still doing this for non-DSC as well. Did we get any
clarification whether that is correct or not?
> + }
> +
> + return 0;
> +}
> +
> static int intel_dp_mst_find_vcpi_slots_for_bpp(struct intel_encoder *encoder,
> struct intel_crtc_state *crtc_state,
> int max_bpp,
> @@ -87,6 +107,10 @@ static int intel_dp_mst_find_vcpi_slots_for_bpp(struct intel_encoder *encoder,
>
> drm_dbg_kms(&i915->drm, "Trying bpp %d\n", bpp);
>
> + ret = intel_dp_mst_check_constraints(i915, bpp, adjusted_mode, crtc_state);
> + if (ret)
> + continue;
> +
> slots = drm_dp_atomic_find_time_slots(state, &intel_dp->mst_mgr,
> connector->port,
> crtc_state->pbn);
> @@ -104,8 +128,8 @@ static int intel_dp_mst_find_vcpi_slots_for_bpp(struct intel_encoder *encoder,
> }
> }
>
> - /* Despite slots are non-zero, we still failed the atomic check */
> - if (ret && slots >= 0)
> + /* We failed to find a proper bpp/timeslots, return error */
> + if (ret)
> slots = ret;
>
> if (slots < 0) {
> --
> 2.37.3
--
Ville Syrjälä
Intel
^ permalink raw reply [flat|nested] 9+ messages in thread
* [Intel-gfx] [PATCH] drm/i915: Implement UHBR bandwidth check
@ 2023-03-24 13:51 Stanislav Lisovskiy
2023-04-04 10:56 ` Govindapillai, Vinod
0 siblings, 1 reply; 9+ messages in thread
From: Stanislav Lisovskiy @ 2023-03-24 13:51 UTC (permalink / raw)
To: intel-gfx; +Cc: jani.nikula
According to spec, we should check if output_bpp * pixel_rate is less
than DDI clock * 72, if UHBR is used.
v2: - s/pipe_config/crtc_state/ (Jani Nikula)
- Merged previous patch into that one, to remove empty function(Jani Nikula)
v3: - Make that constraint check to be DSC-related only
- Limit this to only DISPLAY_VER <= 13
HSDES: 1406899791
BSPEC: 49259
Signed-off-by: Stanislav Lisovskiy <stanislav.lisovskiy@intel.com>
---
drivers/gpu/drm/i915/display/intel_dp_mst.c | 29 +++++++++++++++++++--
1 file changed, 27 insertions(+), 2 deletions(-)
diff --git a/drivers/gpu/drm/i915/display/intel_dp_mst.c b/drivers/gpu/drm/i915/display/intel_dp_mst.c
index a860cbc5dbea..4c0edb760b8e 100644
--- a/drivers/gpu/drm/i915/display/intel_dp_mst.c
+++ b/drivers/gpu/drm/i915/display/intel_dp_mst.c
@@ -45,6 +45,27 @@
#include "intel_hotplug.h"
#include "skl_scaler.h"
+static int intel_dp_mst_check_constraints(struct drm_i915_private *i915, int bpp,
+ const struct drm_display_mode *adjusted_mode,
+ struct intel_crtc_state *crtc_state,
+ bool dsc)
+{
+ if (intel_dp_is_uhbr(crtc_state) && DISPLAY_VER(i915) <= 13 && dsc) {
+ int output_bpp = bpp;
+ /* DisplayPort 2 128b/132b, bits per lane is always 32 */
+ int symbol_clock = crtc_state->port_clock / 32;
+
+ if (output_bpp * adjusted_mode->crtc_clock >=
+ symbol_clock * 72) {
+ drm_dbg_kms(&i915->drm, "UHBR check failed(required bw %d available %d)\n",
+ output_bpp * adjusted_mode->crtc_clock, symbol_clock * 72);
+ return -EINVAL;
+ }
+ }
+
+ return 0;
+}
+
static int intel_dp_mst_find_vcpi_slots_for_bpp(struct intel_encoder *encoder,
struct intel_crtc_state *crtc_state,
int max_bpp,
@@ -87,6 +108,10 @@ static int intel_dp_mst_find_vcpi_slots_for_bpp(struct intel_encoder *encoder,
drm_dbg_kms(&i915->drm, "Trying bpp %d\n", bpp);
+ ret = intel_dp_mst_check_constraints(i915, bpp, adjusted_mode, crtc_state, dsc);
+ if (ret)
+ continue;
+
slots = drm_dp_atomic_find_time_slots(state, &intel_dp->mst_mgr,
connector->port,
crtc_state->pbn);
@@ -104,8 +129,8 @@ static int intel_dp_mst_find_vcpi_slots_for_bpp(struct intel_encoder *encoder,
}
}
- /* Despite slots are non-zero, we still failed the atomic check */
- if (ret && slots >= 0)
+ /* We failed to find a proper bpp/timeslots, return error */
+ if (ret)
slots = ret;
if (slots < 0) {
--
2.37.3
^ permalink raw reply related [flat|nested] 9+ messages in thread
* Re: [Intel-gfx] [PATCH] drm/i915: Implement UHBR bandwidth check
2023-03-24 13:51 Stanislav Lisovskiy
@ 2023-04-04 10:56 ` Govindapillai, Vinod
0 siblings, 0 replies; 9+ messages in thread
From: Govindapillai, Vinod @ 2023-04-04 10:56 UTC (permalink / raw)
To: Lisovskiy, Stanislav, intel-gfx@lists.freedesktop.org; +Cc: Nikula, Jani
Hi Stan,
On Fri, 2023-03-24 at 15:51 +0200, Stanislav Lisovskiy wrote:
> According to spec, we should check if output_bpp * pixel_rate is less
> than DDI clock * 72, if UHBR is used.
>
> v2: - s/pipe_config/crtc_state/ (Jani Nikula)
> - Merged previous patch into that one, to remove empty function(Jani Nikula)
>
> v3: - Make that constraint check to be DSC-related only
> - Limit this to only DISPLAY_VER <= 13
>
> HSDES: 1406899791
> BSPEC: 49259
>
> Signed-off-by: Stanislav Lisovskiy <stanislav.lisovskiy@intel.com>
> ---
> drivers/gpu/drm/i915/display/intel_dp_mst.c | 29 +++++++++++++++++++--
> 1 file changed, 27 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/display/intel_dp_mst.c
> b/drivers/gpu/drm/i915/display/intel_dp_mst.c
> index a860cbc5dbea..4c0edb760b8e 100644
> --- a/drivers/gpu/drm/i915/display/intel_dp_mst.c
> +++ b/drivers/gpu/drm/i915/display/intel_dp_mst.c
> @@ -45,6 +45,27 @@
> #include "intel_hotplug.h"
> #include "skl_scaler.h"
>
> +static int intel_dp_mst_check_constraints(struct drm_i915_private *i915, int bpp,
> + const struct drm_display_mode *adjusted_mode,
> + struct intel_crtc_state *crtc_state,
> + bool dsc)
> +{
> + if (intel_dp_is_uhbr(crtc_state) && DISPLAY_VER(i915) <= 13 && dsc) {
> + int output_bpp = bpp;
> + /* DisplayPort 2 128b/132b, bits per lane is always 32 */
> + int symbol_clock = crtc_state->port_clock / 32;
> +
> + if (output_bpp * adjusted_mode->crtc_clock >=
> + symbol_clock * 72) {
> + drm_dbg_kms(&i915->drm, "UHBR check failed(required bw %d available
> %d)\n",
> + output_bpp * adjusted_mode->crtc_clock, symbol_clock * 72);
> + return -EINVAL;
> + }
> + }
> +
> + return 0;
> +}
> +
> static int intel_dp_mst_find_vcpi_slots_for_bpp(struct intel_encoder *encoder,
> struct intel_crtc_state *crtc_state,
> int max_bpp,
> @@ -87,6 +108,10 @@ static int intel_dp_mst_find_vcpi_slots_for_bpp(struct intel_encoder *encoder,
>
> drm_dbg_kms(&i915->drm, "Trying bpp %d\n", bpp);
>
> + ret = intel_dp_mst_check_constraints(i915, bpp, adjusted_mode, crtc_state, dsc);
> + if (ret)
> + continue;
> +
One suggestion, if you move this constraints check to the top of the "for loop", you may be able to
save an unnecessary "drm_dp_calc_pbn_mode" call in case constraints doesn't match for a bpp.
Reviewed-by: Vinod Govindapillai <vinod.govindapillai@intel.com>
> slots = drm_dp_atomic_find_time_slots(state, &intel_dp->mst_mgr,
> connector->port,
> crtc_state->pbn);
> @@ -104,8 +129,8 @@ static int intel_dp_mst_find_vcpi_slots_for_bpp(struct intel_encoder *encoder,
> }
> }
>
> - /* Despite slots are non-zero, we still failed the atomic check */
> - if (ret && slots >= 0)
> + /* We failed to find a proper bpp/timeslots, return error */
> + if (ret)
> slots = ret;
>
> if (slots < 0) {
^ permalink raw reply [flat|nested] 9+ messages in thread
end of thread, other threads:[~2023-04-04 10:56 UTC | newest]
Thread overview: 9+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-01-13 13:06 [Intel-gfx] [PATCH] drm/i915: Implement UHBR bandwidth check Stanislav Lisovskiy
2023-01-13 14:35 ` [Intel-gfx] ✓ Fi.CI.BAT: success for " Patchwork
2023-01-13 14:43 ` [Intel-gfx] [PATCH] " Ville Syrjälä
2023-01-16 7:51 ` Lisovskiy, Stanislav
2023-01-13 22:43 ` [Intel-gfx] ✓ Fi.CI.IGT: success for " Patchwork
-- strict thread matches above, loose matches on Subject: below --
2023-02-27 11:20 [Intel-gfx] [PATCH] " Stanislav Lisovskiy
2023-03-09 12:54 ` Ville Syrjälä
2023-03-24 13:51 Stanislav Lisovskiy
2023-04-04 10:56 ` Govindapillai, Vinod
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox