Merge tag 'drm-intel-next-2021-05-19-1' of git://anongit.freedesktop.org/drm/drm...

[linux-2.6-microblaze.git] / drivers / gpu / drm / i915 / display / intel_dp_mst.c

diff --git a/drivers/gpu/drm/i915/display/intel_dp_mst.c b/drivers/gpu/drm/i915/display/intel_dp_mst.c
index 5f770fd..332d2f9 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_dp_mst.c
+++ b/drivers/gpu/drm/i915/display/intel_dp_mst.c
@@ -73,7 +73,8 @@ static int intel_dp_mst_compute_link_config(struct intel_encoder *encoder,
                slots = drm_dp_atomic_find_vcpi_slots(state, &intel_dp->mst_mgr,
                                                      connector->port,
                                                      crtc_state->pbn,
-                                                     drm_dp_get_vc_payload_bw(crtc_state->port_clock,
+                                                     drm_dp_get_vc_payload_bw(&intel_dp->mst_mgr,
+                                                                              crtc_state->port_clock,
                                                                               crtc_state->lane_count));
                if (slots == -EDEADLK)
                        return slots;
@@ -944,6 +945,8 @@ intel_dp_mst_encoder_init(struct intel_digital_port *dig_port, int conn_base_id)
        struct intel_dp *intel_dp = &dig_port->dp;
        enum port port = dig_port->base.port;
        int ret;
+       int max_source_rate =
+               intel_dp->source_rates[intel_dp->num_source_rates - 1];
 
        if (!HAS_DP_MST(i915) || intel_dp_is_edp(intel_dp))
                return 0;
@@ -959,7 +962,10 @@ intel_dp_mst_encoder_init(struct intel_digital_port *dig_port, int conn_base_id)
        /* create encoders */
        intel_dp_create_fake_mst_encoders(dig_port);
        ret = drm_dp_mst_topology_mgr_init(&intel_dp->mst_mgr, &i915->drm,
-                                          &intel_dp->aux, 16, 3, conn_base_id);
+                                          &intel_dp->aux, 16, 3,
+                                          (u8)dig_port->max_lanes,
+                                          drm_dp_link_rate_to_bw_code(max_source_rate),
+                                          conn_base_id);
        if (ret)
                return ret;