Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2fed7955 authored by Ville Syrjälä's avatar Ville Syrjälä Committed by Lyude Paul
Browse files

drm/i915: Nuke intel_dp->channel_eq_status 



intel_dp->channel_eq_status is used in exactly one function, and we
don't need it to persist between calls. So just go back to using a
local variable instead.

Signed-off-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: default avatarRodrigo Vivi <rodrigo.vivi@intel.com>
Reviewed-by: default avatarLyude Paul <lyude@redhat.com>
Reviewed-by: default avatarManasi Navare <manasi.d.navare@intel.com>
Signed-off-by: default avatarLyude Paul <lyude@redhat.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20180117192149.17760-4-ville.syrjala@linux.intel.com
parent c85d200e

drivers/gpu/drm/i915/intel_dp_link_training.c

+3 −3
Original line number Diff line number Diff line
@@ -248,6 +248,7 @@ intel_dp_link_training_channel_equalization(struct intel_dp *intel_dp) 
	int tries;

	u32 training_pattern;

	uint8_t link_status[DP_LINK_STATUS_SIZE];

	bool channel_eq = false;



	training_pattern = intel_dp_training_pattern(intel_dp);
@@ -259,7 +260,6 @@ intel_dp_link_training_channel_equalization(struct intel_dp *intel_dp) 
		return false;

	}



	intel_dp->channel_eq_status = false;

	for (tries = 0; tries < 5; tries++) {



		drm_dp_link_train_channel_eq_delay(intel_dp->dpcd);
@@ -279,7 +279,7 @@ intel_dp_link_training_channel_equalization(struct intel_dp *intel_dp) 


		if (drm_dp_channel_eq_ok(link_status,

					 intel_dp->lane_count)) {

			intel_dp->channel_eq_status = true;

			channel_eq = true;

			DRM_DEBUG_KMS("Channel EQ done. DP Training "

				      "successful\n");

			break;
@@ -301,7 +301,7 @@ intel_dp_link_training_channel_equalization(struct intel_dp *intel_dp) 


	intel_dp_set_idle_link_train(intel_dp);



	return intel_dp->channel_eq_status;

	return channel_eq;



}

drivers/gpu/drm/i915/intel_drv.h

+0 −1
Original line number Diff line number Diff line
@@ -1050,7 +1050,6 @@ struct intel_dp { 
	bool link_mst;

	bool has_audio;

	bool detect_done;

	bool channel_eq_status;

	bool reset_link_params;

	enum aux_ch aux_ch;

	uint8_t dpcd[DP_RECEIVER_CAP_SIZE];