Commit c869c5f8 authored by Lyude Paul's avatar Lyude Paul
Browse files

drm/dp_mst: Pass drm_dp_mst_topology_mgr to drm_dp_get_vc_payload_bw() 



Since this is one of the few functions in drm_dp_mst_topology.c that
doesn't have any way of getting access to a drm_device, let's pass the
drm_dp_mst_topology_mgr down to this function so that it can use
drm_dbg_kms().

Signed-off-by: default avatarLyude Paul <lyude@redhat.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20210423184309.207645-14-lyude@redhat.com


Reviewed-by: default avatarDave Airlie <airlied@redhat.com>
parent 318fbd7d

drivers/gpu/drm/drm_dp_mst_topology.c

+5 −2
Original line number Diff line number Diff line
@@ -3638,6 +3638,7 @@ static int drm_dp_send_up_ack_reply(struct drm_dp_mst_topology_mgr *mgr, 


/**

 * drm_dp_get_vc_payload_bw - get the VC payload BW for an MST link

 * @mgr: The &drm_dp_mst_topology_mgr to use

 * @link_rate: link rate in 10kbits/s units

 * @link_lane_count: lane count

 *
@@ -3646,7 +3647,8 @@ static int drm_dp_send_up_ack_reply(struct drm_dp_mst_topology_mgr *mgr, 
 * convert the number of PBNs required for a given stream to the number of

 * timeslots this stream requires in each MTP.

 */

int drm_dp_get_vc_payload_bw(int link_rate, int link_lane_count)

int drm_dp_get_vc_payload_bw(const struct drm_dp_mst_topology_mgr *mgr,

			     int link_rate, int link_lane_count)

{

	if (link_rate == 0 || link_lane_count == 0)

		DRM_DEBUG_KMS("invalid link rate/lane count: (%d / %d)\n",
@@ -3711,7 +3713,8 @@ int drm_dp_mst_topology_mgr_set_mst(struct drm_dp_mst_topology_mgr *mgr, bool ms 
			goto out_unlock;

		}



		mgr->pbn_div = drm_dp_get_vc_payload_bw(drm_dp_bw_code_to_link_rate(mgr->dpcd[1]),

		mgr->pbn_div = drm_dp_get_vc_payload_bw(mgr,

							drm_dp_bw_code_to_link_rate(mgr->dpcd[1]),

							mgr->dpcd[2] & DP_MAX_LANE_COUNT_MASK);

		if (mgr->pbn_div == 0) {

			ret = -EINVAL;

drivers/gpu/drm/i915/display/intel_dp_mst.c

+2 −1
Original line number Diff line number Diff line
@@ -70,7 +70,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;

include/drm/drm_dp_mst_helper.h

+2 −1
Original line number Diff line number Diff line
@@ -783,7 +783,8 @@ drm_dp_mst_detect_port(struct drm_connector *connector, 


struct edid *drm_dp_mst_get_edid(struct drm_connector *connector, struct drm_dp_mst_topology_mgr *mgr, struct drm_dp_mst_port *port);



int drm_dp_get_vc_payload_bw(int link_rate, int link_lane_count);

int drm_dp_get_vc_payload_bw(const struct drm_dp_mst_topology_mgr *mgr,

			     int link_rate, int link_lane_count);



int drm_dp_calc_pbn_mode(int clock, int bpp, bool dsc);