[Intel-gfx] [PATCH 2/5] drm/i915/lvds: only call intel_lvds_init() on platforms that might have LVDS

[Ville Syrjälä]

On Mon, Jan 21, 2019 at 04:21:31PM +0200, Jani Nikula wrote:
> With new platforms not having LVDS support, only call intel_lvds_init()
> on platforms that might actually have LVDS. Move the comment about eDP
> init to the PCH block where it's relevant.
> 
> This puts intel_lvds_init() more in line with the rest of the outputs,
> and makes it slightly easier for the uninitiated to figure out which
> platforms actually have what.
> 
> Signed-off-by: Jani Nikula <jani.nikula at intel.com>

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

> ---
>  drivers/gpu/drm/i915/intel_display.c | 20 +++++++++++++-------
>  1 file changed, 13 insertions(+), 7 deletions(-)
> 
> diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
> index e8bc297c60ab..4b5704a87934 100644
> --- a/drivers/gpu/drm/i915/intel_display.c
> +++ b/drivers/gpu/drm/i915/intel_display.c
> @@ -14310,13 +14310,6 @@ static void intel_setup_outputs(struct drm_i915_private *dev_priv)
>  	if (!HAS_DISPLAY(dev_priv))
>  		return;
>  
> -	/*
> -	 * intel_edp_init_connector() depends on this completing first, to
> -	 * prevent the registeration of both eDP and LVDS and the incorrect
> -	 * sharing of the PPS.
> -	 */
> -	intel_lvds_init(dev_priv);
> -
>  	if (IS_ICELAKE(dev_priv)) {
>  		intel_ddi_init(dev_priv, PORT_A);
>  		intel_ddi_init(dev_priv, PORT_B);
> @@ -14380,6 +14373,13 @@ static void intel_setup_outputs(struct drm_i915_private *dev_priv)
>  	} else if (HAS_PCH_SPLIT(dev_priv)) {
>  		int found;
>  
> +		/*
> +		 * intel_edp_init_connector() depends on this completing first,
> +		 * to prevent the registration of both eDP and LVDS and the
> +		 * incorrect sharing of the PPS.
> +		 */
> +		intel_lvds_init(dev_priv);
> +
>  		if (dev_priv->vbt.int_crt_support)
>  			intel_crt_init(dev_priv);
>  
> @@ -14457,11 +14457,15 @@ static void intel_setup_outputs(struct drm_i915_private *dev_priv)
>  
>  		vlv_dsi_init(dev_priv);
>  	} else if (IS_PINEVIEW(dev_priv)) {
> +		intel_lvds_init(dev_priv);
> +
>  		if (dev_priv->vbt.int_crt_support)
>  			intel_crt_init(dev_priv);
>  	} else if (IS_GEN_RANGE(dev_priv, 3, 4)) {
>  		bool found = false;
>  
> +		intel_lvds_init(dev_priv);
> +
>  		if (dev_priv->vbt.int_crt_support)
>  			intel_crt_init(dev_priv);
>  
> @@ -14497,6 +14501,8 @@ static void intel_setup_outputs(struct drm_i915_private *dev_priv)
>  		if (IS_G4X(dev_priv) && (I915_READ(DP_D) & DP_DETECTED))
>  			intel_dp_init(dev_priv, DP_D, PORT_D);
>  	} else if (IS_GEN(dev_priv, 2)) {
> +		intel_lvds_init(dev_priv);
> +
>  		if (dev_priv->vbt.int_crt_support)
>  			intel_crt_init(dev_priv);
>  
> -- 
> 2.20.1
> 
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx at lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/intel-gfx

-- 
Ville Syrjälä
Intel