[Intel-gfx] [PATCH] drm/i915: Sort newer to older platforms.

Ville Syrjälä ville.syrjala at linux.intel.com
Thu Feb 21 21:39:46 UTC 2019


On Thu, Feb 21, 2019 at 01:33:51PM -0800, Rodrigo Vivi wrote:
> No functional change. Just a reorg to match the preferred
> behavior.
> 
> Cc: Ville Syrjälä <ville.syrjala at linux.intel.com>
> Cc: Lucas De Marchi <lucas.demarchi at intel.com>
> Signed-off-by: Rodrigo Vivi <rodrigo.vivi at intel.com>
> ---
>  drivers/gpu/drm/i915/intel_hdmi.c | 12 ++++++------
>  1 file changed, 6 insertions(+), 6 deletions(-)
> 
> diff --git a/drivers/gpu/drm/i915/intel_hdmi.c b/drivers/gpu/drm/i915/intel_hdmi.c
> index ad81691fa7bf..06d1e3eeaf03 100644
> --- a/drivers/gpu/drm/i915/intel_hdmi.c
> +++ b/drivers/gpu/drm/i915/intel_hdmi.c
> @@ -2575,14 +2575,14 @@ static u8 intel_hdmi_ddc_pin(struct drm_i915_private *dev_priv,
>  		return info->alternate_ddc_pin;
>  	}
>  
> -	if (IS_CHERRYVIEW(dev_priv))
> -		ddc_pin = chv_port_to_ddc_pin(dev_priv, port);
> -	else if (IS_GEN9_LP(dev_priv))
> -		ddc_pin = bxt_port_to_ddc_pin(dev_priv, port);
> +	if (HAS_PCH_ICP(dev_priv))
> +		ddc_pin = icl_port_to_ddc_pin(dev_priv, port);
>  	else if (HAS_PCH_CNP(dev_priv))
>  		ddc_pin = cnp_port_to_ddc_pin(dev_priv, port);
> -	else if (HAS_PCH_ICP(dev_priv))
> -		ddc_pin = icl_port_to_ddc_pin(dev_priv, port);
> +	else if (IS_GEN9_LP(dev_priv))
> +		ddc_pin = bxt_port_to_ddc_pin(dev_priv, port);
> +	if (IS_CHERRYVIEW(dev_priv))

missing else

> +		ddc_pin = chv_port_to_ddc_pin(dev_priv, port);
>  	else
>  		ddc_pin = g4x_port_to_ddc_pin(dev_priv, port);
>  
> -- 
> 2.20.1

-- 
Ville Syrjälä
Intel


More information about the Intel-gfx mailing list