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

Commit c555a81d authored by Ander Conselvan de Oliveira's avatar Ander Conselvan de Oliveira
Browse files

drm/i915: Remove platform specific *_dp_detect() functions 



Their logic is exactly the same: check if the digital port is connected
and then call intel_dp_detect_dpcd(). So just put that logic in their
only caller: intel_dp_detect().

Signed-off-by: default avatarAnder Conselvan de Oliveira <ander.conselvan.de.oliveira@intel.com>
Reviewed-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/1447859970-9546-2-git-send-email-ander.conselvan.de.oliveira@intel.com
parent 51676d0e

drivers/gpu/drm/i915/intel_dp.c

+5 −28
Original line number Diff line number Diff line
@@ -4533,31 +4533,6 @@ bool intel_digital_port_connected(struct drm_i915_private *dev_priv, 
		return g4x_digital_port_connected(dev_priv, port);

}



static enum drm_connector_status

ironlake_dp_detect(struct intel_dp *intel_dp)

{

	struct drm_device *dev = intel_dp_to_dev(intel_dp);

	struct drm_i915_private *dev_priv = dev->dev_private;

	struct intel_digital_port *intel_dig_port = dp_to_dig_port(intel_dp);



	if (!intel_digital_port_connected(dev_priv, intel_dig_port))

		return connector_status_disconnected;



	return intel_dp_detect_dpcd(intel_dp);

}



static enum drm_connector_status

g4x_dp_detect(struct intel_dp *intel_dp)

{

	struct drm_device *dev = intel_dp_to_dev(intel_dp);

	struct intel_digital_port *intel_dig_port = dp_to_dig_port(intel_dp);



	if (!intel_digital_port_connected(dev->dev_private, intel_dig_port))

		return connector_status_disconnected;



	return intel_dp_detect_dpcd(intel_dp);

}



static struct edid *

intel_dp_get_edid(struct intel_dp *intel_dp)

{
@@ -4630,10 +4605,12 @@ intel_dp_detect(struct drm_connector *connector, bool force) 
	/* Can't disconnect eDP, but you can close the lid... */

	if (is_edp(intel_dp))

		status = edp_detect(intel_dp);

	else if (HAS_PCH_SPLIT(dev))

		status = ironlake_dp_detect(intel_dp);

	else if (intel_digital_port_connected(to_i915(dev),

					      dp_to_dig_port(intel_dp)))

		status = intel_dp_detect_dpcd(intel_dp);

	else

		status = g4x_dp_detect(intel_dp);

		status = connector_status_disconnected;



	if (status != connector_status_connected) {

		intel_dp->compliance_test_active = 0;

		intel_dp->compliance_test_type = 0;