Merge tag 'topic/amdgpu-dp2.0-mst-2021-10-27' of git://anongit.freedesktop.org/drm...

UAPI Changes:
Nope!

Cross-subsystem Changes:
drm_dp_update_payload_part1() takes a new argument for specifying what the
VCPI slot start is

Core Changes:
Make the DP MST helpers aware of the current starting VCPI slot/VCPI total
slot count...

Driver Changes:
...and then add support for taking advantage of this for 128b/132b links on DP
2.0 for amdgpu

Signed-off-by: Dave Airlie <[email protected]>
From: Lyude Paul <[email protected]>
Link: https://patchwork.freedesktop.org/patch/msgid/[email protected]

diff --cc drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
Simple merge

diff --cc drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_debugfs.c
Simple merge

diff --cc drivers/gpu/drm/amd/display/dc/core/dc.c
Simple merge

diff --cc drivers/gpu/drm/amd/display/dc/core/dc_link.c
index e5d6cbd7ea7839652f275c4bc916695a5f65a1ea,fd12561b70ccb2ccb27973e0b40d08cea38b575d..ec5f107bc85abeabb3bb1b0968cf0ebde99590fc
--- 1/drivers/gpu/drm/amd/display/dc/core/dc_link.c
--- 2/drivers/gpu/drm/amd/display/dc/core/dc_link.c
+++ b/drivers/gpu/drm/amd/display/dc/core/dc_link.c
@@@ -3232,9 -3272,13 +3232,12 @@@ static struct fixed31_32 get_pbn_from_t
  static void update_mst_stream_alloc_table(
        struct dc_link *link,
        struct stream_encoder *stream_enc,
+ #if defined(CONFIG_DRM_AMD_DC_DCN)
+       struct hpo_dp_stream_encoder *hpo_dp_stream_enc, // TODO: Rename stream_enc to dio_stream_enc?
+ #endif
        const struct dp_mst_stream_allocation_table *proposed_table)
  {
 -      struct link_mst_stream_allocation work_table[MAX_CONTROLLER_NUM] = {
 -                      { 0 } };
 +      struct link_mst_stream_allocation work_table[MAX_CONTROLLER_NUM] = { 0 };
        struct link_mst_stream_allocation *dc_alloc;
  
        int i;
@@@ -3483,9 -3752,13 +3711,13 @@@ static enum dc_status deallocate_mst_pa
        struct dc_link *link = stream->link;
        struct link_encoder *link_encoder = NULL;
        struct stream_encoder *stream_encoder = pipe_ctx->stream_res.stream_enc;
+ #if defined(CONFIG_DRM_AMD_DC_DCN)
+       struct hpo_dp_link_encoder *hpo_dp_link_encoder = link->hpo_dp_link_enc;
+       struct hpo_dp_stream_encoder *hpo_dp_stream_encoder = pipe_ctx->stream_res.hpo_dp_stream_enc;
+ #endif
        struct dp_mst_stream_allocation_table proposed_table = {0};
        struct fixed31_32 avg_time_slots_per_mtp = dc_fixpt_from_int(0);
 -      uint8_t i;
 +      int i;
        bool mst_mode = (link->type == dc_connection_mst_branch);
        DC_LOGGER_INIT(link->ctx->logger);
  

diff --cc drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c
Simple merge

diff --cc drivers/gpu/drm/amd/display/dc/dc_link.h
Simple merge