Skip to content

RFC drm/display/dp_mst: Drop Radeon MST support, make MST atomic-only

Lyude Paul amd-gfx dri-devel intel-gfx lkml nouveau 3 versions – In review

Get series with b4
b4 am [email protected]

Versions newest first · linked by author and title

  1. v4 RFC Latest17 patches 2 repliesIn review
  2. v2 RFC18 patches 0 repliesSuperseded
  3. v1 RFC18 patches 18 repliesSuperseded

Changes in v4 from the cover letter

* Get rid of fix that Wayne pointed out isn't needed

Patches in v4 No applies recorded yet

#Subject and filesSizeRepliesApplied
1/17drm/amdgpu/dc/mst: Rename dp_mst_stream_allocation(_table)drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c drivers/gpu/drm/amd/display/dc/core/dc_link.c drivers/gpu/drm/amd/display/dc/dm_helpers.h +1 more+19 -150 replies
2/17drm/amdgpu/dm/mst: Rename get_payload_table()drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c+4 -30 replies
3/17drm/display/dp_mst: Rename drm_dp_mst_vcpi_allocationdrivers/gpu/drm/display/drm_dp_mst_topology.c include/drm/display/drm_dp_mst_helper.h+50 -500 replies
4/17drm/display/dp_mst: Call them time slots, not VCPI slotsdrivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c drivers/gpu/drm/display/drm_dp_mst_topology.c +3 more+81 -760 replies
5/17drm/display/dp_mst: Fix confusing docs for drm_dp_atomic_release_time_slots()drivers/gpu/drm/display/drm_dp_mst_topology.c+1 -20 replies
6/17drm/display/dp_mst: Add some missing kdocs for atomic MST structsinclude/drm/display/drm_dp_mst_helper.h+23 -00 replies
7/17drm/display/dp_mst: Add helper for finding payloads in atomic MST statedrivers/gpu/drm/display/drm_dp_mst_topology.c+45 -640 replies
8/17drm/display/dp_mst: Add nonblocking helpers for DP MSTdrivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c drivers/gpu/drm/display/drm_dp_mst_topology.c drivers/gpu/drm/i915/display/intel_display.c +2 more+124 -20 replies
9/17drm/display/dp_mst: Don't open code modeset checks for releasing time slotsdrivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c drivers/gpu/drm/display/drm_dp_mst_topology.c drivers/gpu/drm/i915/display/intel_dp_mst.c +1 more+23 -720 replies
10/17drm/display/dp_mst: Fix modeset tracking in drm_dp_atomic_release_vcpi_slots()drivers/gpu/drm/display/drm_dp_mst_topology.c+8 -30 replies
11/17drm/nouveau/kms: Cache DP encoders in nouveau_connectordrivers/gpu/drm/nouveau/nouveau_connector.c drivers/gpu/drm/nouveau/nouveau_connector.h+6 -10 replies
12/17drm/nouveau/kms: Pull mst state in for all modesetsdrivers/gpu/drm/nouveau/dispnv50/disp.c+1 -10 replies
13/17drm/display/dp_mst: Add helpers for serializing SST <-> MST transitionsdrivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c drivers/gpu/drm/display/drm_dp_mst_topology.c drivers/gpu/drm/i915/display/intel_dp.c +4 more+94 -10 replies
14/17drm/display/dp_mst: Drop all ports from topology on CSNs before queueing link address workdrivers/gpu/drm/display/drm_dp_mst_topology.c+8 -60 replies
15/17drm/display/dp_mst: Maintain time slot allocations when deleting payloadsdrivers/gpu/drm/display/drm_dp_mst_topology.c include/drm/display/drm_dp_mst_helper.h+11 -80 replies
16/17drm/radeon: Drop legacy MST supportdrivers/gpu/drm/radeon/Makefile drivers/gpu/drm/radeon/atombios_crtc.c drivers/gpu/drm/radeon/atombios_encoders.c +8 more+7 -9750 replies
17/17drm/display/dp_mst: Move all payload info into the atomic statedrivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c +6 more+526 -8740 replies

Reviews trailers per patch

All 17 patches have a Reviewed-by or Acked-by.

PatchJani NikulaAlex Deucher
1/17A-b
2/17A-b
3/17A-b
4/17A-b
5/17A-b
6/17A-b
7/17A-b
8/17A-b
9/17A-b
10/17A-b
11/17A-b
12/17A-b
13/17A-b
14/17A-b
15/17A-b
16/17A-b A-b
17/17A-b

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

Read the v4 thread

Cover letter [RFC v4 00/17] drm/display/dp_mst: Drop Radeon MST support, make MST atomic-only

For quite a while we've been carrying around a lot of legacy modesetting code in the MST helpers that has been rather annoying to keep around, and very often gets in the way of trying to implement additional functionality in MST such as fallback link rate retraining, dynamic BPC management and DSC support, etc. because of the fact that we can't rely on atomic for everything.

Luckily, we only actually have one user of the legacy MST code in the kernel - radeon. Originally I was thinking of trying to maintain this code and keep it around in some form, but I'm pretty unconvinced anyone is actually using this. My reasoning for that is because I've seen nearly no issues regarding MST on radeon for quite a while now - despite the fact my local testing seems to indicate it's quite broken. This isn't too surprising either, as MST support in radeon.ko is gated behind a module parameter that isn't enabled by default. This isn't to say I wouldn't be open to alternative suggestions, but I'd rather not be the one to have to spend time on that if at all possible! Plus, I already floated the idea of dropping this code by AMD folks a few times and didn't get much resistance.

As well, this series has some basic refactoring that I did along the way and some bugs I had to fix in order to get my atomic-only MST code working. Most of this is pretty straight forward and simply renaming things to more closely match the DisplayPort specification, as I think this will also make maintaining this code a lot easier in the long run (I've gotten myself confused way too many times because of this).

So far I've tested this on all three MST drivers: amdgpu, i915 and nouveau, along with making sure that removing the radeon MST code doesn't break anything else. The one thing I very much could use help with regarding testing though is making sure that this works with amdgpu's DSC support on MST.

So, with this we should be using the atomic state as much as possible with MST modesetting, hooray!

V4:
* Get rid of fix that Wayne pointed out isn't needed

Cc Wayne Lin <[email protected]>
Cc Ville Syrjälä <[email protected]>
Cc Fangzhi Zuo <[email protected]>
Cc Jani Nikula <[email protected]>
Cc Imre Deak <[email protected]>
Cc Daniel Vetter <[email protected]>
Cc Sean Paul <[email protected]>

Lyude Paul (17):
drm/amdgpu/dc/mst: Rename dp_mst_stream_allocation(_table) drm/amdgpu/dm/mst: Rename get_payload_table() drm/display/dp_mst: Rename drm_dp_mst_vcpi_allocation drm/display/dp_mst: Call them time slots, not VCPI slots drm/display/dp_mst: Fix confusing docs for
drm_dp_atomic_release_time_slots()
drm/display/dp_mst: Add some missing kdocs for atomic MST structs drm/display/dp_mst: Add helper for finding payloads in atomic MST
state
drm/display/dp_mst: Add nonblocking helpers for DP MST drm/display/dp_mst: Don't open code modeset checks for releasing time
slots
drm/display/dp_mst: Fix modeset tracking in
drm_dp_atomic_release_vcpi_slots()
drm/nouveau/kms: Cache DP encoders in nouveau_connector drm/nouveau/kms: Pull mst state in for all modesets drm/display/dp_mst: Add helpers for serializing SST <-> MST
transitions
drm/display/dp_mst: Drop all ports from topology on CSNs before
queueing link address work
drm/display/dp_mst: Maintain time slot allocations when deleting
payloads
drm/radeon: Drop legacy MST support
drm/display/dp_mst: Move all payload info into the atomic state

 .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c |   68 +-
 .../amd/display/amdgpu_dm/amdgpu_dm_helpers.c |  108 +-
 .../display/amdgpu_dm/amdgpu_dm_mst_types.c   |  125 +-
 drivers/gpu/drm/amd/display/dc/core/dc_link.c |   10 +-
 drivers/gpu/drm/amd/display/dc/dm_helpers.h   |    4 +-
 .../amd/display/include/link_service_types.h  |   14 +-
 drivers/gpu/drm/display/drm_dp_mst_topology.c | 1137 ++++++++---------
 drivers/gpu/drm/i915/display/intel_display.c  |    6 +
 drivers/gpu/drm/i915/display/intel_dp.c       |    9 +
 drivers/gpu/drm/i915/display/intel_dp_mst.c   |   91 +-
 drivers/gpu/drm/i915/display/intel_hdcp.c     |   24 +-
 drivers/gpu/drm/nouveau/dispnv50/disp.c       |  197 ++-
 drivers/gpu/drm/nouveau/dispnv50/disp.h       |    2 +
 drivers/gpu/drm/nouveau/nouveau_connector.c   |   18 +-
 drivers/gpu/drm/nouveau/nouveau_connector.h   |    3 +
 drivers/gpu/drm/radeon/Makefile               |    2 +-
 drivers/gpu/drm/radeon/atombios_crtc.c        |   11 +-
 drivers/gpu/drm/radeon/atombios_encoders.c    |   59 -
 drivers/gpu/drm/radeon/radeon_atombios.c      |    2 -
 drivers/gpu/drm/radeon/radeon_connectors.c    |   61 +-
 drivers/gpu/drm/radeon/radeon_device.c        |    1 -
 drivers/gpu/drm/radeon/radeon_dp_mst.c        |  778 -----------
 drivers/gpu/drm/radeon/radeon_drv.c           |    4 -
 drivers/gpu/drm/radeon/radeon_encoders.c      |   14 +-
 drivers/gpu/drm/radeon/radeon_irq_kms.c       |   10 +-
 drivers/gpu/drm/radeon/radeon_mode.h          |   40 -
 include/drm/display/drm_dp_mst_helper.h       |  234 ++--
 27 files changed, 955 insertions(+), 2077 deletions(-)
 delete mode 100644 drivers/gpu/drm/radeon/radeon_dp_mst.c
Signature · 1 line
2.37.1