drm/i915/dp_mst: Fix active port PLL selection for secondary MST streams
Subsystems (3)
PATCH 1/1 drm/i915/dp_mst: Fix active port PLL selection for secondary MST streams
The port PLL selection needs to be up-to-date in the CRTC state of both the primary and all secondary MST streams. The commit removing the encoder update_prepare/complete hooks (see Fixes: below), stopped doing this for secondary streams, fix this up.
--- drivers/gpu/drm/i915/display/intel_ddi.c | 27 +++++++++++++++------ drivers/gpu/drm/i915/display/intel_ddi.h | 3 +++ drivers/gpu/drm/i915/display/intel_dp_mst.c | 7 ++++++ 3 files changed, 30 insertions(+), 7 deletions(-)
drivers/gpu/drm/i915/display/intel_ddi.c +20 -7
@@ -3349,6 +3349,25 @@ void intel_ddi_update_pipe(struct intel_atomic_state *state,intel_hdcp_update_pipe (state, encoder, crtc_state, conn_state); } +void intel_ddi_update_active_dpll (struct intel_atomic_state *state, +struct intel_encoder *encoder, +struct intel_crtc *crtc) +{ +struct drm_i915_private *i915 =to_i915 (encoder->base.dev); +struct intel_crtc_state *crtc_state = +intel_atomic_get_new_crtc_state (state, crtc); +struct intel_crtc *slave_crtc; +enum phy phy =intel_port_to_phy (i915, encoder->port); + +if (!intel_phy_is_tc (i915, phy)) +return ; + +intel_update_active_dpll (state, crtc, encoder); +for_each_intel_crtc_in_pipe_mask (&i915->drm, slave_crtc, +intel_crtc_bigjoiner_slave_pipes (crtc_state)) +intel_update_active_dpll (state, slave_crtc, encoder); +} + static void intel_ddi_pre_pll_enable(struct intel_atomic_state *state, struct intel_encoder *encoder,
@@ -3363,15 +3382,9 @@ intel_ddi_pre_pll_enable(struct intel_atomic_state *state,if (is_tc_port) {struct intel_crtc *master_crtc =to_intel_crtc (crtc_state->uapi.crtc); -struct intel_crtc *slave_crtc;intel_tc_port_get_link (dig_port, crtc_state->lane_count); - -intel_update_active_dpll (state, master_crtc, encoder); - -for_each_intel_crtc_in_pipe_mask (&dev_priv->drm, slave_crtc, -intel_crtc_bigjoiner_slave_pipes (crtc_state)) -intel_update_active_dpll (state, slave_crtc, encoder); +intel_ddi_update_active_dpll (state, encoder, master_crtc); }main_link_aux_power_domain_get (dig_port, crtc_state);
drivers/gpu/drm/i915/display/intel_ddi.h +3 -0
@@ -72,5 +72,8 @@ void intel_ddi_sanitize_encoder_pll_mapping(struct intel_encoder *encoder);int intel_ddi_level (struct intel_encoder *encoder,const struct intel_crtc_state *crtc_state,int lane); +void intel_ddi_update_active_dpll (struct intel_atomic_state *state, +struct intel_encoder *encoder, +struct intel_crtc *crtc);#endif /* __INTEL_DDI_H__ */
drivers/gpu/drm/i915/display/intel_dp_mst.c +7 -0
@@ -674,6 +674,13 @@ static void intel_mst_pre_pll_enable_dp(struct intel_atomic_state *state,if (intel_dp->active_mst_links ==0 ) dig_port->base.pre_pll_enable (state, &dig_port->base, pipe_config,NULL ); +else +/* +* The port PLL state needs to get updated for secondary +* streams as for the primary stream. +*/ +intel_ddi_update_active_dpll (state, &dig_port->base, +to_intel_crtc (pipe_config->uapi.crtc)); } static void intel_mst_pre_enable_dp(struct intel_atomic_state *state,
Signature · 1 line
2.37.2
Patchwork
CI[Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for drm/i915/dp_mst: Fix active port PLL selection for secondary MST streams
== Series Details ==
== Series Details ==
Series: drm/i915/dp_mst: Fix active port PLL selection for secondary MST streams
URL : https://patchwork.freedesktop.org/series/116501/
State : warning
== Summary ==
Error: dim checkpatch failedc712173a3b8b drm/i915/dp_mst: Fix active port PLL selection for secondary MST streams -:13: WARNING:COMMIT_LOG_USE_LINK: Unknown link reference 'Closes:', use 'Link:' instead #13:
total: 0 errors, 1 warnings, 0 checks, 62 lines checked
Patchwork
CI[Intel-gfx] ✓ Fi.CI.BAT: success for drm/i915/dp_mst: Fix active port PLL selection for secondary MST streams
In reply to Imre Deak== Series Details ==
== Series Details ==
Series: drm/i915/dp_mst: Fix active port PLL selection for secondary MST streams
URL : https://patchwork.freedesktop.org/series/116501/
State : success
== Summary ==
CI Bug Log - changes from CI_DRM_13008 -> Patchwork_116501v1
====================================================
Summary
-------
**SUCCESS**
No regressions found.
External URL: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_116501v1/index.html
Participating hosts (37 -> 36)
------------------------------
Missing (1): fi-snb-2520m
Known issues
------------
Here are the changes found in Patchwork_116501v1 that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@gem_exec_suspend@basic-s3@smem:
- bat-rpls-2: [PASS][1] -> [FAIL][2] ([fdo#103375]) +1 similar issue
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13008/bat-rpls-2/igt@gem_exec_suspend@[email protected]
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_116501v1/bat-rpls-2/igt@gem_exec_suspend@[email protected]
* igt@i915_selftest@live@slpc:
- bat-rpls-1: [PASS][3] -> [DMESG-FAIL][4] ([i915#6367] / [i915#7996])
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13008/bat-rpls-1/igt@i915_selftest@[email protected]
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_116501v1/bat-rpls-1/igt@i915_selftest@[email protected]
#### Warnings ####
* igt@i915_selftest@live@slpc:
- bat-rpls-2: [DMESG-FAIL][5] ([i915#6997] / [i915#7913]) -> [DMESG-FAIL][6] ([i915#6367] / [i915#7913])
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13008/bat-rpls-2/igt@i915_selftest@[email protected]
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_116501v1/bat-rpls-2/igt@i915_selftest@[email protected]
[fdo#103375]: https://bugs.freedesktop.org/show_bug.cgi?id=103375
[i915#6367]: https://gitlab.freedesktop.org/drm/intel/issues/6367
[i915#6997]: https://gitlab.freedesktop.org/drm/intel/issues/6997
[i915#7913]: https://gitlab.freedesktop.org/drm/intel/issues/7913
[i915#7996]: https://gitlab.freedesktop.org/drm/intel/issues/7996
Build changes
-------------
* Linux: CI_DRM_13008 -> Patchwork_116501v1
CI-20190529: 20190529
CI_DRM_13008: 7862c60adcb74785d0063f6d978adf8c38cda97c @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_7256: 066fa5410180730b85f61e4f3073da9a2055dc49 @ https://gitlab.freedesktop.org/drm/igt-gpu-tools.git
Patchwork_116501v1: 7862c60adcb74785d0063f6d978adf8c38cda97c @ git://anongit.freedesktop.org/gfx-ci/linux
### Linux commits
8f212688886b drm/i915/dp_mst: Fix active port PLL selection for secondary MST streams
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_116501v1/index.html
Patchwork
CI[Intel-gfx] ✓ Fi.CI.IGT: success for drm/i915/dp_mst: Fix active port PLL selection for secondary MST streams
In reply to Imre Deak== Series Details ==
== Series Details ==
Series: drm/i915/dp_mst: Fix active port PLL selection for secondary MST streams
URL : https://patchwork.freedesktop.org/series/116501/
State : success
== Summary ==
CI Bug Log - changes from CI_DRM_13008_full -> Patchwork_116501v1_full
====================================================
Summary
-------
**SUCCESS**
No regressions found.
Participating hosts (7 -> 8)
------------------------------
Additional (1): shard-tglu0
Possible new issues
-------------------
Here are the unknown changes that may have been introduced in Patchwork_116501v1_full:
### IGT changes ###
#### Suppressed ####
The following results come from untrusted machines, tests, or statuses. They do not affect the overall result.
* igt@gem_create@create-clear@smem0:
- {shard-rkl}: [PASS][1] -> [ABORT][2]
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13008/shard-rkl-2/igt@gem_create@[email protected]
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_116501v1/shard-rkl-4/igt@gem_create@[email protected]
Known issues
------------
Here are the changes found in Patchwork_116501v1_full that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@gem_lmem_swapping@parallel-random-verify-ccs:
- shard-apl: NOTRUN -> [SKIP][3] ([fdo#109271] / [i915#4613]) +1 similar issue
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_116501v1/shard-apl2/igt@[email protected]
* igt@gen9_exec_parse@basic-rejected-ctx-param:
- shard-snb: NOTRUN -> [SKIP][4] ([fdo#109271]) +44 similar issues
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_116501v1/shard-snb2/igt@[email protected]
* igt@kms_ccs@pipe-a-bad-pixel-format-4_tiled_dg2_rc_ccs_cc:
- shard-apl: NOTRUN -> [SKIP][5] ([fdo#109271]) +78 similar issues
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_116501v1/shard-apl1/igt@kms_ccs@pipe-a-bad-pixel-format-4_tiled_dg2_rc_ccs_cc.html
* igt@kms_ccs@pipe-a-missing-ccs-buffer-y_tiled_gen12_rc_ccs_cc:
- shard-apl: NOTRUN -> [SKIP][6] ([fdo#109271] / [i915#3886]) +3 similar issues
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_116501v1/shard-apl1/igt@kms_ccs@pipe-a-missing-ccs-buffer-y_tiled_gen12_rc_ccs_cc.html
* igt@kms_ccs@pipe-c-bad-aux-stride-y_tiled_gen12_rc_ccs_cc:
- shard-glk: NOTRUN -> [SKIP][7] ([fdo#109271] / [i915#3886])
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_116501v1/shard-glk3/igt@kms_ccs@pipe-c-bad-aux-stride-y_tiled_gen12_rc_ccs_cc.html
* igt@kms_content_protection@uevent@pipe-a-dp-1:
- shard-apl: NOTRUN -> [FAIL][8] ([i915#1339])
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_116501v1/shard-apl1/igt@kms_content_protection@[email protected]
* igt@kms_cursor_legacy@flip-vs-cursor-atomic-transitions-varying-size:
- shard-apl: [PASS][9] -> [FAIL][10] ([i915#2346])
[9]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13008/shard-apl7/igt@kms_cursor_legacy@flip-vs-cursor-atomic-transitions-varying-size.html
[10]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_116501v1/shard-apl3/igt@kms_cursor_legacy@flip-vs-cursor-atomic-transitions-varying-size.html
- shard-glk: [PASS][11] -> [FAIL][12] ([i915#2346])
[11]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13008/shard-glk8/igt@kms_cursor_legacy@flip-vs-cursor-atomic-transitions-varying-size.html
[12]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_116501v1/shard-glk8/igt@kms_cursor_legacy@flip-vs-cursor-atomic-transitions-varying-size.html
* igt@kms_plane_alpha_blend@alpha-opaque-fb@pipe-a-hdmi-a-1:
- shard-glk: NOTRUN -> [FAIL][13] ([i915#4573]) +1 similar issue
[13]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_116501v1/shard-glk3/igt@kms_plane_alpha_blend@[email protected]
* igt@kms_psr2_sf@overlay-plane-update-sf-dmg-area:
- shard-apl: NOTRUN -> [SKIP][14] ([fdo#109271] / [i915#658])
[14]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_116501v1/shard-apl2/igt@[email protected]
* igt@v3d/v3d_perfmon@create-perfmon-exceed:
- shard-glk: NOTRUN -> [SKIP][15] ([fdo#109271]) +41 similar issues
[15]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_116501v1/shard-glk3/igt@v3d/[email protected]
#### Possible fixes ####
* igt@drm_fdinfo@idle@rcs0:
- {shard-rkl}: [FAIL][16] ([i915#7742]) -> [PASS][17]
[16]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13008/shard-rkl-7/igt@drm_fdinfo@[email protected]
[17]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_116501v1/shard-rkl-6/igt@drm_fdinfo@[email protected]
* igt@gem_barrier_race@remote-request@rcs0:
- shard-apl: [ABORT][18] ([i915#8211] / [i915#8234]) -> [PASS][19]
[18]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13008/shard-apl2/igt@gem_barrier_race@[email protected]
[19]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_116501v1/shard-apl1/igt@gem_barrier_race@[email protected]
* igt@gem_eio@reset-stress:
- {shard-dg1}: [FAIL][20] ([i915#5784]) -> [PASS][21]
[20]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13008/shard-dg1-15/igt@[email protected]
[21]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_116501v1/shard-dg1-17/igt@[email protected]
* igt@gem_exec_fair@basic-deadline:
- shard-apl: [FAIL][22] ([i915#2846]) -> [PASS][23]
[22]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13008/shard-apl3/igt@[email protected]
[23]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_116501v1/shard-apl7/igt@[email protected]
* igt@gem_exec_fair@basic-flow@rcs0:
- {shard-tglu}: [FAIL][24] ([i915#2842]) -> [PASS][25]
[24]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13008/shard-tglu-10/igt@gem_exec_fair@[email protected]
[25]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_116501v1/shard-tglu-5/igt@gem_exec_fair@[email protected]
* igt@gen9_exec_parse@allowed-single:
- shard-glk: [ABORT][26] ([i915#5566]) -> [PASS][27]
[26]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13008/shard-glk4/igt@[email protected]
[27]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_116501v1/shard-glk3/igt@[email protected]
* igt@i915_pm_dc@dc9-dpms:
- {shard-tglu}: [SKIP][28] ([i915#4281]) -> [PASS][29]
[28]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13008/shard-tglu-5/igt@[email protected]
[29]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_116501v1/shard-tglu-2/igt@[email protected]
* igt@i915_pm_rpm@dpms-mode-unset-lpsp:
- {shard-rkl}: [SKIP][30] ([i915#1397]) -> [PASS][31] +2 similar issues
[30]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13008/shard-rkl-3/igt@[email protected]
[31]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_116501v1/shard-rkl-7/igt@[email protected]
* igt@i915_pm_rpm@modeset-lpsp:
- {shard-dg1}: [SKIP][32] ([i915#1397]) -> [PASS][33]
[32]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13008/shard-dg1-18/igt@[email protected]
[33]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_116501v1/shard-dg1-14/igt@[email protected]
* igt@i915_selftest@live@gt_pm:
- {shard-rkl}: [DMESG-FAIL][34] ([i915#4258]) -> [PASS][35]
[34]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13008/shard-rkl-4/igt@i915_selftest@live@gt_pm.html
[35]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_116501v1/shard-rkl-7/igt@i915_selftest@live@gt_pm.html
* igt@i915_selftest@mock@sanitycheck:
- shard-snb: [ABORT][36] ([i915#4528]) -> [PASS][37]
[36]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13008/shard-snb5/igt@i915_selftest@[email protected]
[37]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_116501v1/shard-snb2/igt@i915_selftest@[email protected]
* igt@kms_cursor_legacy@flip-vs-cursor-atomic-transitions:
- shard-apl: [FAIL][38] ([i915#2346]) -> [PASS][39]
[38]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13008/shard-apl6/igt@[email protected]
[39]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_116501v1/shard-apl6/igt@[email protected]
* igt@kms_flip@flip-vs-suspend-interruptible@b-dp1:
- shard-apl: [ABORT][40] ([i915#180]) -> [PASS][41]
[40]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13008/shard-apl7/igt@kms_flip@[email protected]
[41]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_116501v1/shard-apl2/igt@kms_flip@[email protected]
* igt@kms_plane_scaling@i915-max-src-size@pipe-a-hdmi-a-2:
- {shard-rkl}: [FAIL][42] ([i915#8292]) -> [PASS][43]
[42]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13008/shard-rkl-2/igt@kms_plane_scaling@[email protected]
[43]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_116501v1/shard-rkl-4/igt@kms_plane_scaling@[email protected]
{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
[fdo#109289]: https://bugs.freedesktop.org/show_bug.cgi?id=109289
[fdo#109302]: https://bugs.freedesktop.org/show_bug.cgi?id=109302
[fdo#109307]: https://bugs.freedesktop.org/show_bug.cgi?id=109307
[fdo#111615]: https://bugs.freedesktop.org/show_bug.cgi?id=111615
[fdo#111825]: https://bugs.freedesktop.org/show_bug.cgi?id=111825
[fdo#111827]: https://bugs.freedesktop.org/show_bug.cgi?id=111827
[fdo#112283]: https://bugs.freedesktop.org/show_bug.cgi?id=112283
[i915#1072]: https://gitlab.freedesktop.org/drm/intel/issues/1072
[i915#1339]: https://gitlab.freedesktop.org/drm/intel/issues/1339
[i915#1397]: https://gitlab.freedesktop.org/drm/intel/issues/1397
[i915#180]: https://gitlab.freedesktop.org/drm/intel/issues/180
[i915#1902]: https://gitlab.freedesktop.org/drm/intel/issues/1902
[i915#2346]: https://gitlab.freedesktop.org/drm/intel/issues/2346
[i915#2434]: https://gitlab.freedesktop.org/drm/intel/issues/2434
[i915#2527]: https://gitlab.freedesktop.org/drm/intel/issues/2527
[i915#2575]: https://gitlab.freedesktop.org/drm/intel/issues/2575
[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#2846]: https://gitlab.freedesktop.org/drm/intel/issues/2846
[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#3297]: https://gitlab.freedesktop.org/drm/intel/issues/3297
[i915#3299]: https://gitlab.freedesktop.org/drm/intel/issues/3299
[i915#3318]: https://gitlab.freedesktop.org/drm/intel/issues/3318
[i915#3359]: https://gitlab.freedesktop.org/drm/intel/issues/3359
[i915#3458]: https://gitlab.freedesktop.org/drm/intel/issues/3458
[i915#3539]: https://gitlab.freedesktop.org/drm/intel/issues/3539
[i915#3555]: https://gitlab.freedesktop.org/drm/intel/issues/3555
[i915#3591]: https://gitlab.freedesktop.org/drm/intel/issues/3591
[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#3742]: https://gitlab.freedesktop.org/drm/intel/issues/3742
[i915#3804]: https://gitlab.freedesktop.org/drm/intel/issues/3804
[i915#3886]: https://gitlab.freedesktop.org/drm/intel/issues/3886
[i915#3952]: https://gitlab.freedesktop.org/drm/intel/issues/3952
[i915#3989]: https://gitlab.freedesktop.org/drm/intel/issues/3989
[i915#4070]: https://gitlab.freedesktop.org/drm/intel/issues/4070
[i915#4077]: https://gitlab.freedesktop.org/drm/intel/issues/4077
[i915#4078]: https://gitlab.freedesktop.org/drm/intel/issues/4078
[i915#4079]: https://gitlab.freedesktop.org/drm/intel/issues/4079
[i915#4083]: https://gitlab.freedesktop.org/drm/intel/issues/4083
[i915#4103]: https://gitlab.freedesktop.org/drm/intel/issues/4103
[i915#4212]: https://gitlab.freedesktop.org/drm/intel/issues/4212
[i915#4213]: https://gitlab.freedesktop.org/drm/intel/issues/4213
[i915#4258]: https://gitlab.freedesktop.org/drm/intel/issues/4258
[i915#4270]: https://gitlab.freedesktop.org/drm/intel/issues/4270
[i915#4281]: https://gitlab.freedesktop.org/drm/intel/issues/4281
[i915#4528]: https://gitlab.freedesktop.org/drm/intel/issues/4528
[i915#4538]: https://gitlab.freedesktop.org/drm/intel/issues/4538
[i915#454]: https://gitlab.freedesktop.org/drm/intel/issues/454
[i915#4565]: https://gitlab.freedesktop.org/drm/intel/issues/4565
[i915#4573]: https://gitlab.freedesktop.org/drm/intel/issues/4573
[i915#4579]: https://gitlab.freedesktop.org/drm/intel/issues/4579
[i915#4613]: https://gitlab.freedesktop.org/drm/intel/issues/4613
[i915#4816]: https://gitlab.freedesktop.org/drm/intel/issues/4816
[i915#4818]: https://gitlab.freedesktop.org/drm/intel/issues/4818
[i915#4833]: https://gitlab.freedesktop.org/drm/intel/issues/4833
[i915#4852]: https://gitlab.freedesktop.org/drm/intel/issues/4852
[i915#4860]: https://gitlab.freedesktop.org/drm/intel/issues/4860
[i915#4880]: https://gitlab.freedesktop.org/drm/intel/issues/4880
[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#5325]: https://gitlab.freedesktop.org/drm/intel/issues/5325
[i915#5439]: https://gitlab.freedesktop.org/drm/intel/issues/5439
[i915#5563]: https://gitlab.freedesktop.org/drm/intel/issues/5563
[i915#5566]: https://gitlab.freedesktop.org/drm/intel/issues/5566
[i915#5784]: https://gitlab.freedesktop.org/drm/intel/issues/5784
[i915#6095]: https://gitlab.freedesktop.org/drm/intel/issues/6095
[i915#6245]: https://gitlab.freedesktop.org/drm/intel/issues/6245
[i915#6524]: https://gitlab.freedesktop.org/drm/intel/issues/6524
[i915#658]: https://gitlab.freedesktop.org/drm/intel/issues/658
[i915#6946]: https://gitlab.freedesktop.org/drm/intel/issues/6946
[i915#7116]: https://gitlab.freedesktop.org/drm/intel/issues/7116
[i915#7711]: https://gitlab.freedesktop.org/drm/intel/issues/7711
[i915#7742]: https://gitlab.freedesktop.org/drm/intel/issues/7742
[i915#7828]: https://gitlab.freedesktop.org/drm/intel/issues/7828
[i915#8150]: https://gitlab.freedesktop.org/drm/intel/issues/8150
[i915#8211]: https://gitlab.freedesktop.org/drm/intel/issues/8211
[i915#8234]: https://gitlab.freedesktop.org/drm/intel/issues/8234
[i915#8292]: https://gitlab.freedesktop.org/drm/intel/issues/8292
[i915#8304]: https://gitlab.freedesktop.org/drm/intel/issues/8304
Build changes
-------------
* Linux: CI_DRM_13008 -> Patchwork_116501v1
CI-20190529: 20190529
CI_DRM_13008: 7862c60adcb74785d0063f6d978adf8c38cda97c @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_7256: 066fa5410180730b85f61e4f3073da9a2055dc49 @ https://gitlab.freedesktop.org/drm/igt-gpu-tools.git
Patchwork_116501v1: 7862c60adcb74785d0063f6d978adf8c38cda97c @ 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_116501v1/index.html
Quoted 13 lines
-----Original Message-----
From: Deak, Imre <[email protected]>
Sent: Friday, April 14, 2023 8:38 PM
To: [email protected]
Cc: Kahola, Mika <[email protected]>
Subject: [PATCH] drm/i915/dp_mst: Fix active port PLL selection for secondary MST streamsThe port PLL selection needs to be up-to-date in the CRTC state of both the primary and all secondary MST streams. The commit removing the encoder update_prepare/complete hooks (see Fixes: below), stopped doing this for secondary streams, fix this up.
Quoted 4 lines
Fixes 0f752b2178c9 ("drm/i915: Remove the encoderupdate_prepare()/complete() hooks")
Cc Mika Kahola <[email protected]>
Quoted 94 lines
Signed-off-by Imre Deak <[email protected]>--- drivers/gpu/drm/i915/display/intel_ddi.c | 27 +++++++++++++++------ drivers/gpu/drm/i915/display/intel_ddi.h | 3 +++ drivers/gpu/drm/i915/display/intel_dp_mst.c | 7 ++++++ 3 files changed, 30 insertions(+), 7 deletions(-)drivers/gpu/drm/i915/display/intel_ddi.c +19
-7@@ -3349,6 +3349,25 @@ void intel_ddi_update_pipe(structintel_atomic_state *state,intel_hdcp_update_pipe (state ,encoder ,crtc_state ,conn_state ); } +void intel_ddi_update_active_dpll (struct intel_atomic_state *state, +struct intel_encoder *encoder, +struct intel_crtc *crtc) +{ +struct drm_i915_private *i915 =to_i915 (encoder->base.dev); +struct intel_crtc_state *crtc_state = +intel_atomic_get_new_crtc_state (state, crtc); +struct intel_crtc *slave_crtc; +enum phy phy =intel_port_to_phy (i915, encoder->port); + +if (!intel_phy_is_tc (i915, phy)) +return ; + +intel_update_active_dpll (state, crtc, encoder); +for_each_intel_crtc_in_pipe_mask (&i915->drm, slave_crtc, +intel_crtc_bigjoiner_slave_pipes (crtc_state)) +intel_update_active_dpll (state, slave_crtc, encoder); } + static void intel_ddi_pre_pll_enable(struct intel_atomic_state *state, struct intel_encoder *encoder,@@ -3363,15 +3382,9 @@ intel_ddi_pre_pll_enable(struct intel_atomic_state *state, if (is_tc_port) {struct intel_crtc *master_crtc =to_intel_crtc (crtc_state->uapi.crtc); -struct intel_crtc *slave_crtc;intel_tc_port_get_link (dig_port, crtc_state->lane_count); - -intel_update_active_dpll (state, master_crtc, encoder); - -for_each_intel_crtc_in_pipe_mask (&dev_priv->drm, slave_crtc, - intel_crtc_bigjoiner_slave_pipes(crtc_state)) -intel_update_active_dpll (state, slave_crtc, encoder); +intel_ddi_update_active_dpll (state, encoder, master_crtc); }
main_link_aux_power_domain_get(dig_port, crtc_state); diff --gita/drivers/gpu/drm/i915/display/intel_ddi.hb/drivers/gpu/drm/i915/display/intel_ddi.h
indexc85e74ae68e4d..2bc034042a937100644drivers/gpu/drm/i915/display/intel_ddi.h +3
-0@@ -72,5 +72,8 @@ void intel_ddi_sanitize_encoder_pll_mapping(struct intel_encoder *encoder); int intel_ddi_level(struct intel_encoder *encoder,const struct intel_crtc_state *crtc_state,int lane); +void intel_ddi_update_active_dpll (struct intel_atomic_state *state, +struct intel_encoder *encoder, +struct intel_crtc *crtc);#endif /* __INTEL_DDI_H__ */ drivers/gpu/drm/i915/display/intel_dp_mst.c +7
-0@@ -674,6 +674,13 @@ static void intel_mst_pre_pll_enable_dp(struct intel_atomic_state *state, if (intel_dp->active_mst_links == 0) dig_port->base.pre_pll_enable(state, &dig_port->base, pipe_config,NULL ); + else + /* + * The port PLL state needs to get updated for secondary + * streams as for the primary stream. + */ + intel_ddi_update_active_dpll(state, &dig_port->base, +to_intel_crtc (pipe_config- >uapi.crtc)); }static void intel_mst_pre_enable_dp(struct
intel_atomic_state*state,
--
2.37.2