[Intel-gfx] [PATCH] drm/i915: name intel dp hooks per platform

[Ville Syrjälä]

On Fri, Sep 06, 2013 at 07:38:29AM +0300, Jani Nikula wrote:
> In line with the rest of the code base. No functional changes.
> 
> v2: also s/intel_pre_enable_dp/g4x_pre_enable_dp/ for consistency (Ville)
> 
> Signed-off-by: Jani Nikula <jani.nikula at intel.com>

Reviewed-by: Ville Syrjälä <ville.syrjala at linux.intel.com>

for the series.

> ---
>  drivers/gpu/drm/i915/intel_dp.c |   18 ++++++++++--------
>  1 file changed, 10 insertions(+), 8 deletions(-)
> 
> diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c
> index d6eba38..fa11979 100644
> --- a/drivers/gpu/drm/i915/intel_dp.c
> +++ b/drivers/gpu/drm/i915/intel_dp.c
> @@ -1720,11 +1720,16 @@ static void intel_enable_dp(struct intel_encoder *encoder)
>  	ironlake_edp_backlight_on(intel_dp);
>  }
>  
> +static void g4x_enable_dp(struct intel_encoder *encoder)
> +{
> +	intel_enable_dp(encoder);
> +}
> +
>  static void vlv_enable_dp(struct intel_encoder *encoder)
>  {
>  }
>  
> -static void intel_pre_enable_dp(struct intel_encoder *encoder)
> +static void g4x_pre_enable_dp(struct intel_encoder *encoder)
>  {
>  	struct intel_dp *intel_dp = enc_to_intel_dp(&encoder->base);
>  	struct intel_digital_port *dport = dp_to_dig_port(intel_dp);
> @@ -1764,7 +1769,7 @@ static void vlv_pre_enable_dp(struct intel_encoder *encoder)
>  	vlv_wait_port_ready(dev_priv, port);
>  }
>  
> -static void intel_dp_pre_pll_enable(struct intel_encoder *encoder)
> +static void vlv_dp_pre_pll_enable(struct intel_encoder *encoder)
>  {
>  	struct intel_digital_port *dport = enc_to_dig_port(&encoder->base);
>  	struct drm_device *dev = encoder->base.dev;
> @@ -1774,9 +1779,6 @@ static void intel_dp_pre_pll_enable(struct intel_encoder *encoder)
>  	int port = vlv_dport_to_channel(dport);
>  	int pipe = intel_crtc->pipe;
>  
> -	if (!IS_VALLEYVIEW(dev))
> -		return;
> -
>  	/* Program Tx lane resets to default */
>  	mutex_lock(&dev_priv->dpio_lock);
>  	vlv_dpio_write(dev_priv, pipe, DPIO_PCS_TX(port),
> @@ -3549,12 +3551,12 @@ intel_dp_init(struct drm_device *dev, int output_reg, enum port port)
>  	intel_encoder->get_hw_state = intel_dp_get_hw_state;
>  	intel_encoder->get_config = intel_dp_get_config;
>  	if (IS_VALLEYVIEW(dev)) {
> -		intel_encoder->pre_pll_enable = intel_dp_pre_pll_enable;
> +		intel_encoder->pre_pll_enable = vlv_dp_pre_pll_enable;
>  		intel_encoder->pre_enable = vlv_pre_enable_dp;
>  		intel_encoder->enable = vlv_enable_dp;
>  	} else {
> -		intel_encoder->pre_enable = intel_pre_enable_dp;
> -		intel_encoder->enable = intel_enable_dp;
> +		intel_encoder->pre_enable = g4x_pre_enable_dp;
> +		intel_encoder->enable = g4x_enable_dp;
>  	}
>  
>  	intel_dig_port->port = port;
> -- 
> 1.7.10.4

-- 
Ville Syrjälä
Intel OTC