Commit 182ccc43 authored by Luca Coelho's avatar Luca Coelho Committed by Lucas De Marchi
Browse files

drm/i915/tc: remove "fia" from intel_tc_port_fia_max_lane_count() 



It is irrelevant for the caller that the max lane count is being
derived from a FIA register, so having "fia" in the function name is
irrelevant.  Rename the function accordingly.

Reviewed-by: default avatarLucas De Marchi <lucas.demarchi@intel.com>
Reviewed-by: default avatarSuraj Kandpal <suraj.kandpal@intel.com>
Signed-off-by: default avatarLuca Coelho <luciano.coelho@intel.com>
Signed-off-by: default avatarLucas De Marchi <lucas.demarchi@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20230825081638.275795-5-luciano.coelho@intel.com
parent 6a96c1c6

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

+1 −1
Original line number Diff line number Diff line
@@ -58,7 +58,7 @@ static u8 intel_cx0_get_owned_lane_mask(struct drm_i915_private *i915, 
	 * In DP-alt with pin assignment D, only PHY lane 0 is owned

	 * by display and lane 1 is owned by USB.

	 */

	return intel_tc_port_fia_max_lane_count(dig_port) > 2

	return intel_tc_port_max_lane_count(dig_port) > 2

		? INTEL_CX0_BOTH_LANES : INTEL_CX0_LANE0;

}

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

+2 −2
Original line number Diff line number Diff line
@@ -306,13 +306,13 @@ static int intel_dp_max_common_lane_count(struct intel_dp *intel_dp) 
	struct intel_digital_port *dig_port = dp_to_dig_port(intel_dp);

	int source_max = intel_dp_max_source_lane_count(dig_port);

	int sink_max = intel_dp->max_sink_lane_count;

	int fia_max = intel_tc_port_fia_max_lane_count(dig_port);

	int lane_max = intel_tc_port_max_lane_count(dig_port);

	int lttpr_max = drm_dp_lttpr_max_lane_count(intel_dp->lttpr_common_caps);



	if (lttpr_max)

		sink_max = min(sink_max, lttpr_max);



	return min3(source_max, sink_max, fia_max);

	return min3(source_max, sink_max, lane_max);

}



int intel_dp_max_lane_count(struct intel_dp *intel_dp)

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

+2 −2
Original line number Diff line number Diff line
@@ -337,7 +337,7 @@ static int intel_tc_port_get_max_lane_count(struct intel_digital_port *dig_port) 
	}

}



int intel_tc_port_fia_max_lane_count(struct intel_digital_port *dig_port)

int intel_tc_port_max_lane_count(struct intel_digital_port *dig_port)

{

	struct drm_i915_private *i915 = to_i915(dig_port->base.base.dev);

	struct intel_tc_port *tc = to_tc_port(dig_port);
@@ -589,7 +589,7 @@ static bool tc_phy_verify_legacy_or_dp_alt_mode(struct intel_tc_port *tc, 
	struct intel_digital_port *dig_port = tc->dig_port;

	int max_lanes;



	max_lanes = intel_tc_port_fia_max_lane_count(dig_port);

	max_lanes = intel_tc_port_max_lane_count(dig_port);

	if (tc->mode == TC_PORT_LEGACY) {

		drm_WARN_ON(&i915->drm, max_lanes != 4);

		return true;

drivers/gpu/drm/i915/display/intel_tc.h

+1 −1
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ bool intel_tc_port_connected(struct intel_encoder *encoder); 
bool intel_tc_port_connected_locked(struct intel_encoder *encoder);



u32 intel_tc_port_get_pin_assignment_mask(struct intel_digital_port *dig_port);

int intel_tc_port_fia_max_lane_count(struct intel_digital_port *dig_port);

int intel_tc_port_max_lane_count(struct intel_digital_port *dig_port);

void intel_tc_port_set_fia_lane_count(struct intel_digital_port *dig_port,

				      int required_lanes);