drm/i915/ehl: Map MCC pins based on PHY, not port

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.

We're only converting the MCC function at the moment since EHL is the
only platform that has configurations where port!=phy.

Cc: José Roberto de Souza <jose.souza@intel.com>
Signed-off-by: Matt Roper <matthew.d.roper@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20190712221641.21031-1-matthew.d.roper@intel.com
Reviewed-by: José Roberto de Souza <jose.souza@intel.com>

diff --git a/drivers/gpu/drm/i915/display/intel_hdmi.c b/drivers/gpu/drm/i915/display/intel_hdmi.c
index 77af0dfd93cedeee1973ecd302a5e024e70c76a4..098ea2c5d83174c8e7e6219f369e53a6c01d09a6 100644 (file)
--- 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;
        }