Skip to content

drm/i915: drm/i915/dp_mst: Fix MST payload removal during output disabling

Imre Deak dri-devel intel-gfx oe-kbuild oe-kbuild-all stable 3 versions – In review

Get series with b4
b4 am [email protected]

Versions newest first · linked by author and title

  1. v2 Latest posting 2/217 patches 16 repliesIn review
  2. v2 posting 1/21 of 9 patches 2 repliesSuperseded
  3. v19 patches 9 repliesSuperseded

Patches in v2 posting 2/2 No applies recorded yet

#Subject and filesSizeRepliesApplied
1/17drm/i915/dp_mst: Add the MST topology state for modesetted CRTCsdrivers/gpu/drm/i915/display/intel_display.c drivers/gpu/drm/i915/display/intel_dp_mst.c drivers/gpu/drm/i915/display/intel_dp_mst.h+69 -00 replies
2/17drm/display/dp_mst: Handle old/new payload states in drm_dp_remove_payload()drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c drivers/gpu/drm/display/drm_dp_mst_topology.c drivers/gpu/drm/i915/display/intel_dp_mst.c +2 more+21 -167 replies
3/17drm/display/dp_mst: Add drm_atomic_get_old_mst_topology_state()drivers/gpu/drm/display/drm_dp_mst_topology.c include/drm/display/drm_dp_mst_helper.h+32 -40 replies
4/17drm/i915/dp_mst: Fix payload removal during output disablingdrivers/gpu/drm/i915/display/intel_dp_mst.c+10 -60 replies
5/17drm/display/dp_mst: Fix the payload VCPI check in drm_dp_mst_dump_topology()drivers/gpu/drm/display/drm_dp_mst_topology.c+1 -10 replies
6/17drm/display/dp_mst: Sanitize payload iteration in drm_dp_mst_dump_topology()drivers/gpu/drm/display/drm_dp_mst_topology.c+28 -173 replies
7/17drm/i915: Factor out helpers for modesetting CRTCs and connectorsdrivers/gpu/drm/i915/display/intel_atomic.c drivers/gpu/drm/i915/display/intel_atomic.h drivers/gpu/drm/i915/display/intel_cdclk.c +6 more+159 -1170 replies
8/17drm/i915/dp_mst: Move getting the MST topology state earlier to connector checkdrivers/gpu/drm/i915/display/intel_dp_mst.c+15 -80 replies
9/17drm/display/dp_mst: Add a helper to verify the MST payload statedrivers/gpu/drm/display/drm_dp_mst_topology.c include/drm/display/drm_dp.h include/drm/display/drm_dp_mst_helper.h+175 -00 replies
10/17drm/i915/dp_mst: Verify the MST state of modesetted outputsdrivers/gpu/drm/i915/display/intel_display.c drivers/gpu/drm/i915/display/intel_dp.c drivers/gpu/drm/i915/display/intel_dp.h +3 more+45 -20 replies
11/17drm/display/dp_mst: Add helpers to query for payload allocation errorsdrivers/gpu/drm/display/drm_dp_mst_topology.c include/drm/display/drm_dp_mst_helper.h+33 -51 reply
12/17drm/display/dp_mst: Add helpers to query payload allocation propertiesdrivers/gpu/drm/display/drm_dp_mst_topology.c include/drm/display/drm_dp_mst_helper.h+57 -00 replies
13/17drm/display/dp_mst: Export the DP_PAYLOAD_TABLE_SIZE definitiondrivers/gpu/drm/display/drm_dp_mst_topology.c include/drm/display/drm_dp.h+2 -20 replies
14/17drm/display/dp_mst: Factor out a helper to reset the payload tabledrivers/gpu/drm/display/drm_dp_mst_topology.c include/drm/display/drm_dp_mst_helper.h+8 -10 replies
15/17drm/dp: Add a quirk for a DELL P2715Q MST payload allocation problemdrivers/gpu/drm/display/drm_dp_helper.c include/drm/display/drm_dp_helper.h+10 -00 replies
16/17drm/i915/dp_mst: Add workaround for a DELL P2715Q payload allocation problemdrivers/gpu/drm/i915/display/intel_atomic.c drivers/gpu/drm/i915/display/intel_atomic.h drivers/gpu/drm/i915/display/intel_display_types.h +2 more+61 -93 replies
17/17drm/i915/dp_mst: Verify the HW state of MST encodersdrivers/gpu/drm/i915/display/intel_ddi.c drivers/gpu/drm/i915/display/intel_display.c drivers/gpu/drm/i915/display/intel_display_types.h +4 more+173 -162 replies

Reviews trailers per patch

5 of 17 patches have a Reviewed-by or Acked-by.

PatchVille SyrjäläLyude Paul
1/17R-b
2/17R-b R-b
3/17R-b
4/17R-b
5/17
6/17
7/17
8/17
9/17
10/17
11/17
12/17
13/17
14/17
15/17
16/17R-b R-b
17/17

Trailers given in replies are filled; those carried in the patches from earlier versions are outlined with dashes.

Read the v2 thread

Cover letter [Intel-gfx] [PATCH v2 00/17] drm/i915: drm/i915/dp_mst: Fix MST payload removal during output disabling

This is v2 of [1], addressing the review comments from Ville. It also adds HW state verification for MST encoders and a workaround for a payload allocation problem in a DELL monitor's MST hub I noticed during testing.

Tested on HSW, ICL, ADLP.

[1] https://lore.kernel.org/intel-gfx/[email protected]/

Cc Ville Syrjälä <[email protected]>
Cc Lyude Paul <[email protected]>

Imre Deak (17):
drm/i915/dp_mst: Add the MST topology state for modesetted CRTCs drm/display/dp_mst: Handle old/new payload states in
drm_dp_remove_payload()
drm/display/dp_mst: Add drm_atomic_get_old_mst_topology_state() drm/i915/dp_mst: Fix payload removal during output disabling drm/display/dp_mst: Fix the payload VCPI check in
drm_dp_mst_dump_topology()
drm/display/dp_mst: Sanitize payload iteration in
drm_dp_mst_dump_topology()
drm/i915: Factor out helpers for modesetting CRTCs and connectors drm/i915/dp_mst: Move getting the MST topology state earlier to
connector check
drm/display/dp_mst: Add a helper to verify the MST payload state drm/i915/dp_mst: Verify the MST state of modesetted outputs drm/display/dp_mst: Add helpers to query for payload allocation errors drm/display/dp_mst: Add helpers to query payload allocation properties drm/display/dp_mst: Export the DP_PAYLOAD_TABLE_SIZE definition drm/display/dp_mst: Factor out a helper to reset the payload table drm/dp: Add a quirk for a DELL P2715Q MST payload allocation problem drm/i915/dp_mst: Add workaround for a DELL P2715Q payload allocation
problem
drm/i915/dp_mst: Verify the HW state of MST encoders

 .../amd/display/amdgpu_dm/amdgpu_dm_helpers.c |   2 +-
 drivers/gpu/drm/display/drm_dp_helper.c       |   2 +
 drivers/gpu/drm/display/drm_dp_mst_topology.c | 354 ++++++++++++++++--
 drivers/gpu/drm/i915/display/intel_atomic.c   | 140 +++++++
 drivers/gpu/drm/i915/display/intel_atomic.h   |   8 +
 drivers/gpu/drm/i915/display/intel_cdclk.c    |   2 +-
 drivers/gpu/drm/i915/display/intel_ddi.c      |  91 ++++-
 drivers/gpu/drm/i915/display/intel_display.c  |  59 +--
 drivers/gpu/drm/i915/display/intel_display.h  |   2 -
 .../drm/i915/display/intel_display_types.h    |  19 +
 drivers/gpu/drm/i915/display/intel_dp.c       |  43 +--
 drivers/gpu/drm/i915/display/intel_dp.h       |   1 +
 drivers/gpu/drm/i915/display/intel_dp_mst.c   | 270 +++++++++++--
 drivers/gpu/drm/i915/display/intel_dp_mst.h   |   9 +
 .../drm/i915/display/intel_modeset_verify.c   |   2 +
 drivers/gpu/drm/i915/display/skl_watermark.c  |   2 +-
 drivers/gpu/drm/i915/i915_reg.h               |   6 +-
 drivers/gpu/drm/nouveau/dispnv50/disp.c       |   2 +-
 include/drm/display/drm_dp.h                  |   5 +
 include/drm/display/drm_dp_helper.h           |   8 +
 include/drm/display/drm_dp_mst_helper.h       |  34 +-
 21 files changed, 878 insertions(+), 183 deletions(-)
Signature · 1 line
2.37.1