[Intel-gfx] [PATCH] drm/i915/ehl: Map MCC pins based on PHY, not port

[Souza, Jose]

On Fri, 2019-07-12 at 15:16 -0700, Matt Roper wrote:
> Now that we distinguish between phy and port(ddi),
> mcc_port_to_ddc_pin
> should use the phy, not the DDI, for determining DDC pins.

Nit: Maybe add to the commit message why you are only converting this
one and not the others?

Anyways:

Reviewed-by: José Roberto de Souza <jose.souza at intel.com>

> 
> Cc: José Roberto de Souza <jose.souza at intel.com>
> Signed-off-by: Matt Roper <matthew.d.roper at intel.com>
> ---
>  drivers/gpu/drm/i915/display/intel_hdmi.c | 11 ++++++-----
>  1 file changed, 6 insertions(+), 5 deletions(-)
> 
> diff --git a/drivers/gpu/drm/i915/display/intel_hdmi.c
> b/drivers/gpu/drm/i915/display/intel_hdmi.c
> index 77af0dfd93ce..098ea2c5d831 100644
> --- a/drivers/gpu/drm/i915/display/intel_hdmi.c
> +++ b/drivers/gpu/drm/i915/display/intel_hdmi.c
> @@ -2943,20 +2943,21 @@ static u8 icl_port_to_ddc_pin(struct
> drm_i915_private *dev_priv, enum port port)
>  
>  static u8 mcc_port_to_ddc_pin(struct drm_i915_private *dev_priv,
> enum port port)
>  {
> +	enum phy phy = intel_port_to_phy(dev_priv, port);
>  	u8 ddc_pin;
>  
> -	switch (port) {
> -	case PORT_A:
> +	switch (phy) {
> +	case PHY_A:
>  		ddc_pin = GMBUS_PIN_1_BXT;
>  		break;
> -	case PORT_B:
> +	case PHY_B:
>  		ddc_pin = GMBUS_PIN_2_BXT;
>  		break;
> -	case PORT_C:
> +	case PHY_C:
>  		ddc_pin = GMBUS_PIN_9_TC1_ICP;
>  		break;
>  	default:
> -		MISSING_CASE(port);
> +		MISSING_CASE(phy);
>  		ddc_pin = GMBUS_PIN_1_BXT;
>  		break;
>  	}