drm/i915: add port parameter to intel_hdmi_init

Instead of having a giant if cascade to figure this out according to
the passed-in register. We could do quite a bit more cleaning up and
all by using the port at more places, but I think this should be part
of a bigger rework to introduce a struct intel_digital_port which
would keep track of all these things. I guess this will be part of
some haswell-DP-induced refactoring.

For now this rips out the big cascade, which is what annoyed me so
much.

v2: Add port variable name back for the func decl (I've tried to trick
myself below the 80 char limit).

Reviewed-by: Paulo Zanoni <paulo.r.zanoni@intel.com>
Signed-Off-by: Daniel Vetter <daniel.vetter@ffwll.ch>

1 files changed, 12 insertions, 29 deletions

diff --git a/drivers/gpu/drm/i915/intel_hdmi.c b/drivers/gpu/drm/i915/intel_hdmi.c
index 593b8fe2e00a..e4c37bb572e8 100644
--- a/drivers/gpu/drm/i915/intel_hdmi.c
+++ b/drivers/gpu/drm/i915/intel_hdmi.c
@@ -889,7 +889,7 @@ intel_hdmi_add_properties(struct intel_hdmi *intel_hdmi, struct drm_connector *c
         intel_attach_broadcast_rgb_property(connector);
 }
 
-void intel_hdmi_init(struct drm_device *dev, int sdvox_reg)
+void intel_hdmi_init(struct drm_device *dev, int sdvox_reg, enum port port)
 {
         struct drm_i915_private *dev_priv = dev->dev_private;
         struct drm_connector *connector;
@@ -925,40 +925,23 @@ void intel_hdmi_init(struct drm_device *dev, int sdvox_reg)
 
         intel_encoder->cloneable = false;
 
-        /* Set up the DDC bus. */
-        if (sdvox_reg == SDVOB) {
+        intel_hdmi->ddi_port = port;
+        switch (port) {
+        case PORT_B:
                 intel_hdmi->ddc_bus = GMBUS_PORT_DPB;
                 dev_priv->hotplug_supported_mask |= HDMIB_HOTPLUG_INT_STATUS;
-        } else if (sdvox_reg == SDVOC) {
-                intel_hdmi->ddc_bus = GMBUS_PORT_DPC;
-                dev_priv->hotplug_supported_mask |= HDMIC_HOTPLUG_INT_STATUS;
-        } else if (sdvox_reg == HDMIB) {
-                intel_hdmi->ddc_bus = GMBUS_PORT_DPB;
-                dev_priv->hotplug_supported_mask |= HDMIB_HOTPLUG_INT_STATUS;
-        } else if (sdvox_reg == HDMIC) {
-                intel_hdmi->ddc_bus = GMBUS_PORT_DPC;
-                dev_priv->hotplug_supported_mask |= HDMIC_HOTPLUG_INT_STATUS;
-        } else if (sdvox_reg == HDMID) {
-                intel_hdmi->ddc_bus = GMBUS_PORT_DPD;
-                dev_priv->hotplug_supported_mask |= HDMID_HOTPLUG_INT_STATUS;
-        } else if (sdvox_reg == DDI_BUF_CTL(PORT_B)) {
-                DRM_DEBUG_DRIVER("LPT: detected output on DDI B\n");
-                intel_hdmi->ddc_bus = GMBUS_PORT_DPB;
-                intel_hdmi->ddi_port = PORT_B;
-                dev_priv->hotplug_supported_mask |= HDMIB_HOTPLUG_INT_STATUS;
-        } else if (sdvox_reg == DDI_BUF_CTL(PORT_C)) {
-                DRM_DEBUG_DRIVER("LPT: detected output on DDI C\n");
+                break;
+        case PORT_C:
                 intel_hdmi->ddc_bus = GMBUS_PORT_DPC;
-                intel_hdmi->ddi_port = PORT_C;
                 dev_priv->hotplug_supported_mask |= HDMIC_HOTPLUG_INT_STATUS;
-        } else if (sdvox_reg == DDI_BUF_CTL(PORT_D)) {
-                DRM_DEBUG_DRIVER("LPT: detected output on DDI D\n");
+                break;
+        case PORT_D:
                 intel_hdmi->ddc_bus = GMBUS_PORT_DPD;
-                intel_hdmi->ddi_port = PORT_D;
                 dev_priv->hotplug_supported_mask |= HDMID_HOTPLUG_INT_STATUS;
-        } else {
-                /* If we got an unknown sdvox_reg, things are pretty much broken
-                 * in a way that we should let the kernel know about it */
+                break;
+        case PORT_A:
+                /* Internal port only for eDP. */
+        default:
                 BUG();
         }