Commit db0f7e20 authored by Imre Deak's avatar Imre Deak
Browse files

drm/i915/dp: Rename intel_dp::link_trained to link.active 



The intel_dp::link_trained flag indicates whether the link is active,
regardless of whether the link training passed or failed. For clarity
rename the flag to 'active'. While at it move the flag under
intel_dp::link.

Suggested-by: default avatarJani Nikula <jani.nikula@intel.com>
Reviewed-by: default avatarJani Nikula <jani.nikula@intel.com>
Signed-off-by: default avatarImre Deak <imre.deak@intel.com>
Link: https://lore.kernel.org/r/20250404150310.1156696-2-imre.deak@intel.com
parent ced5e64f

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

+1 −1
Original line number Diff line number Diff line
@@ -519,7 +519,7 @@ static void intel_disable_dp(struct intel_atomic_state *state, 
{

	struct intel_dp *intel_dp = enc_to_intel_dp(encoder);



	intel_dp->link_trained = false;

	intel_dp->link.active = false;



	/*

	 * Make sure the panel is off before trying to change the mode.

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

+1 −1
Original line number Diff line number Diff line
@@ -3550,7 +3550,7 @@ static void intel_ddi_disable_dp(struct intel_atomic_state *state, 
	struct intel_connector *connector =

		to_intel_connector(old_conn_state->connector);



	intel_dp->link_trained = false;

	intel_dp->link.active = false;



	intel_psr_disable(intel_dp, old_crtc_state);

	intel_edp_backlight_off(old_conn_state);

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

+1 −1
Original line number Diff line number Diff line
@@ -1658,7 +1658,6 @@ struct intel_dp { 
	int link_rate;

	u8 lane_count;

	u8 sink_count;

	bool link_trained;

	bool needs_modeset_retry;

	bool use_max_params;

	u8 dpcd[DP_RECEIVER_CAP_SIZE];
@@ -1683,6 +1682,7 @@ struct intel_dp { 
	int common_rates[DP_MAX_SUPPORTED_RATES];

	struct {

		/* TODO: move the rest of link specific fields to here */

		bool active;

		/* common rate,lane_count configs in bw order */

		int num_configs;

#define INTEL_DP_MAX_LANE_COUNT			4

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

+3 −3
Original line number Diff line number Diff line
@@ -3222,7 +3222,7 @@ void intel_dp_set_link_params(struct intel_dp *intel_dp, 
			      int link_rate, int lane_count)

{

	memset(intel_dp->train_set, 0, sizeof(intel_dp->train_set));

	intel_dp->link_trained = false;

	intel_dp->link.active = false;

	intel_dp->needs_modeset_retry = false;

	intel_dp->link_rate = link_rate;

	intel_dp->lane_count = lane_count;
@@ -3586,7 +3586,7 @@ void intel_dp_sync_state(struct intel_encoder *encoder, 
	if (crtc_state) {

		intel_dp_reset_link_params(intel_dp);

		intel_dp_set_link_params(intel_dp, crtc_state->port_clock, crtc_state->lane_count);

		intel_dp->link_trained = true;

		intel_dp->link.active = true;

	}

}
@@ -5081,7 +5081,7 @@ intel_dp_needs_link_retrain(struct intel_dp *intel_dp) 
{

	u8 link_status[DP_LINK_STATUS_SIZE];



	if (!intel_dp->link_trained)

	if (!intel_dp->link.active)

		return false;



	/*

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

+4 −4
Original line number Diff line number Diff line
@@ -168,7 +168,7 @@ static int intel_dp_init_lttpr_phys(struct intel_dp *intel_dp, const u8 dpcd[DP_ 
	 * resetting its internal state when the mode is changed from

	 * non-transparent to transparent.

	 */

	if (intel_dp->link_trained) {

	if (intel_dp->link.active) {

		if (lttpr_count < 0 || intel_dp_lttpr_transparent_mode_enabled(intel_dp))

			goto out_reset_lttpr_count;
@@ -1142,7 +1142,7 @@ void intel_dp_stop_link_train(struct intel_dp *intel_dp, 
	struct intel_display *display = to_intel_display(intel_dp);

	struct intel_encoder *encoder = &dp_to_dig_port(intel_dp)->base;



	intel_dp->link_trained = true;

	intel_dp->link.active = true;



	intel_dp_disable_dpcd_training_pattern(intel_dp, DP_PHY_DPRX);

	intel_dp_program_link_training_pattern(intel_dp, crtc_state, DP_PHY_DPRX,
@@ -1735,7 +1735,7 @@ static int i915_dp_force_link_rate_show(struct seq_file *m, void *data) 
	if (err)

		return err;



	if (intel_dp->link_trained)

	if (intel_dp->link.active)

		current_rate = intel_dp->link_rate;

	force_rate = intel_dp->link.force_rate;
@@ -1833,7 +1833,7 @@ static int i915_dp_force_lane_count_show(struct seq_file *m, void *data) 
	if (err)

		return err;



	if (intel_dp->link_trained)

	if (intel_dp->link.active)

		current_lane_count = intel_dp->lane_count;

	force_lane_count = intel_dp->link.force_lane_count;