[Intel-gfx] [PATCH 2/2] drm/i915: Remove platform specific *_dp_detect() functions

[Ander Conselvan De Oliveira]

On Wed, 2015-11-18 at 17:28 +0200, Ville Syrjälä wrote:
> On Wed, Nov 18, 2015 at 05:19:30PM +0200, Ander Conselvan de Oliveira wrote:
> > 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: Ander Conselvan de Oliveira <
> > ander.conselvan.de.oliveira at intel.com>
> > ---
> >  drivers/gpu/drm/i915/intel_dp.c | 33 +++++----------------------------
> >  1 file changed, 5 insertions(+), 28 deletions(-)
> > 
> > diff --git a/drivers/gpu/drm/i915/intel_dp.c
> > b/drivers/gpu/drm/i915/intel_dp.c
> > index 2b28762..9217705 100644
> > --- a/drivers/gpu/drm/i915/intel_dp.c
> > +++ b/drivers/gpu/drm/i915/intel_dp.c
> > @@ -4534,31 +4534,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)
> >  {
> > @@ -4631,10 +4606,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;
> > +
> 
> Reviewed-by: Ville Syrjälä <ville.syrjala at linux.intel.com>

Both pushed to dinq. Thanks for reviewing.

Ander

> 
> >  	if (status != connector_status_connected) {
> >  		intel_dp->compliance_test_active = 0;
> >  		intel_dp->compliance_test_type = 0;
> > -- 
> > 2.4.3
> > 
> > _______________________________________________
> > Intel-gfx mailing list
> > Intel-gfx at lists.freedesktop.org
> > http://lists.freedesktop.org/mailman/listinfo/intel-gfx
>