1 files changed, 29 insertions, 42 deletions

diff --git a/drivers/gpu/drm/i915/intel_dvo.c b/drivers/gpu/drm/i915/intel_dvo.c
index 7c9ec1472d46..6eda1b51c636 100644
--- a/drivers/gpu/drm/i915/intel_dvo.c
+++ b/drivers/gpu/drm/i915/intel_dvo.c
@@ -72,7 +72,7 @@ static const struct intel_dvo_device intel_dvo_devices[] = {
                 .name = "ch7017",
                 .dvo_reg = DVOC,
                 .slave_addr = 0x75,
-                .gpio = GPIOE,
+                .gpio = GMBUS_PORT_DPB,
                 .dev_ops = &ch7017_ops,
         }
 };
@@ -88,7 +88,13 @@ struct intel_dvo {
 
 static struct intel_dvo *enc_to_intel_dvo(struct drm_encoder *encoder)
 {
-        return container_of(enc_to_intel_encoder(encoder), struct intel_dvo, base);
+        return container_of(encoder, struct intel_dvo, base.base);
+}
+
+static struct intel_dvo *intel_attached_dvo(struct drm_connector *connector)
+{
+        return container_of(intel_attached_encoder(connector),
+                            struct intel_dvo, base);
 }
 
 static void intel_dvo_dpms(struct drm_encoder *encoder, int mode)
@@ -112,8 +118,7 @@ static void intel_dvo_dpms(struct drm_encoder *encoder, int mode)
 static int intel_dvo_mode_valid(struct drm_connector *connector,
                                 struct drm_display_mode *mode)
 {
-        struct drm_encoder *encoder = intel_attached_encoder(connector);
-        struct intel_dvo *intel_dvo = enc_to_intel_dvo(encoder);
+        struct intel_dvo *intel_dvo = intel_attached_dvo(connector);
 
         if (mode->flags & DRM_MODE_FLAG_DBLSCAN)
                 return MODE_NO_DBLESCAN;
@@ -173,7 +178,7 @@ static void intel_dvo_mode_set(struct drm_encoder *encoder,
         int pipe = intel_crtc->pipe;
         u32 dvo_val;
         u32 dvo_reg = intel_dvo->dev.dvo_reg, dvo_srcdim_reg;
-        int dpll_reg = (pipe == 0) ? DPLL_A : DPLL_B;
+        int dpll_reg = DPLL(pipe);
 
         switch (dvo_reg) {
         case DVOA:
@@ -224,23 +229,22 @@ static void intel_dvo_mode_set(struct drm_encoder *encoder,
 static enum drm_connector_status
 intel_dvo_detect(struct drm_connector *connector, bool force)
 {
-        struct drm_encoder *encoder = intel_attached_encoder(connector);
-        struct intel_dvo *intel_dvo = enc_to_intel_dvo(encoder);
-
+        struct intel_dvo *intel_dvo = intel_attached_dvo(connector);
         return intel_dvo->dev.dev_ops->detect(&intel_dvo->dev);
 }
 
 static int intel_dvo_get_modes(struct drm_connector *connector)
 {
-        struct drm_encoder *encoder = intel_attached_encoder(connector);
-        struct intel_dvo *intel_dvo = enc_to_intel_dvo(encoder);
+        struct intel_dvo *intel_dvo = intel_attached_dvo(connector);
+        struct drm_i915_private *dev_priv = connector->dev->dev_private;
 
         /* We should probably have an i2c driver get_modes function for those
          * devices which will have a fixed set of modes determined by the chip
          * (TV-out, for example), but for now with just TMDS and LVDS,
          * that's not the case.
          */
-        intel_ddc_get_modes(connector, intel_dvo->base.ddc_bus);
+        intel_ddc_get_modes(connector,
+                            &dev_priv->gmbus[GMBUS_PORT_DPC].adapter);
         if (!list_empty(&connector->probed_modes))
                 return 1;
 
@@ -281,7 +285,7 @@ static const struct drm_connector_funcs intel_dvo_connector_funcs = {
 static const struct drm_connector_helper_funcs intel_dvo_connector_helper_funcs = {
         .mode_valid = intel_dvo_mode_valid,
         .get_modes = intel_dvo_get_modes,
-        .best_encoder = intel_attached_encoder,
+        .best_encoder = intel_best_encoder,
 };
 
 static void intel_dvo_enc_destroy(struct drm_encoder *encoder)
@@ -311,8 +315,7 @@ intel_dvo_get_current_mode(struct drm_connector *connector)
 {
         struct drm_device *dev = connector->dev;
         struct drm_i915_private *dev_priv = dev->dev_private;
-        struct drm_encoder *encoder = intel_attached_encoder(connector);
-        struct intel_dvo *intel_dvo = enc_to_intel_dvo(encoder);
+        struct intel_dvo *intel_dvo = intel_attached_dvo(connector);
         uint32_t dvo_val = I915_READ(intel_dvo->dev.dvo_reg);
         struct drm_display_mode *mode = NULL;
 
@@ -323,7 +326,7 @@ intel_dvo_get_current_mode(struct drm_connector *connector)
                 struct drm_crtc *crtc;
                 int pipe = (dvo_val & DVO_PIPE_B_SELECT) ? 1 : 0;
 
-                crtc = intel_get_crtc_from_pipe(dev, pipe);
+                crtc = intel_get_crtc_for_pipe(dev, pipe);
                 if (crtc) {
                         mode = intel_crtc_mode_get(dev, crtc);
                         if (mode) {
@@ -341,11 +344,10 @@ intel_dvo_get_current_mode(struct drm_connector *connector)
 
 void intel_dvo_init(struct drm_device *dev)
 {
+        struct drm_i915_private *dev_priv = dev->dev_private;
         struct intel_encoder *intel_encoder;
         struct intel_dvo *intel_dvo;
         struct intel_connector *intel_connector;
-        struct i2c_adapter *i2cbus = NULL;
-        int ret = 0;
         int i;
         int encoder_type = DRM_MODE_ENCODER_NONE;
 
@@ -360,16 +362,14 @@ void intel_dvo_init(struct drm_device *dev)
         }
 
         intel_encoder = &intel_dvo->base;
-
-        /* Set up the DDC bus */
-        intel_encoder->ddc_bus = intel_i2c_create(dev, GPIOD, "DVODDC_D");
-        if (!intel_encoder->ddc_bus)
-                goto free_intel;
+        drm_encoder_init(dev, &intel_encoder->base,
+                         &intel_dvo_enc_funcs, encoder_type);
 
         /* Now, try to find a controller */
         for (i = 0; i < ARRAY_SIZE(intel_dvo_devices); i++) {
                 struct drm_connector *connector = &intel_connector->base;
                 const struct intel_dvo_device *dvo = &intel_dvo_devices[i];
+                struct i2c_adapter *i2c;
                 int gpio;
 
                 /* Allow the I2C driver info to specify the GPIO to be used in
@@ -379,24 +379,18 @@ void intel_dvo_init(struct drm_device *dev)
                 if (dvo->gpio != 0)
                         gpio = dvo->gpio;
                 else if (dvo->type == INTEL_DVO_CHIP_LVDS)
-                        gpio = GPIOB;
+                        gpio = GMBUS_PORT_SSC;
                 else
-                        gpio = GPIOE;
+                        gpio = GMBUS_PORT_DPB;
 
                 /* Set up the I2C bus necessary for the chip we're probing.
                  * It appears that everything is on GPIOE except for panels
                  * on i830 laptops, which are on GPIOB (DVOA).
                  */
-                if (i2cbus != NULL)
-                        intel_i2c_destroy(i2cbus);
-                if (!(i2cbus = intel_i2c_create(dev, gpio,
-                        gpio == GPIOB ? "DVOI2C_B" : "DVOI2C_E"))) {
-                        continue;
-                }
+                i2c = &dev_priv->gmbus[gpio].adapter;
 
                 intel_dvo->dev = *dvo;
-                ret = dvo->dev_ops->init(&intel_dvo->dev, i2cbus);
-                if (!ret)
+                if (!dvo->dev_ops->init(&intel_dvo->dev, i2c))
                         continue;
 
                 intel_encoder->type = INTEL_OUTPUT_DVO;
@@ -427,13 +421,10 @@ void intel_dvo_init(struct drm_device *dev)
                 connector->interlace_allowed = false;
                 connector->doublescan_allowed = false;
 
-                drm_encoder_init(dev, &intel_encoder->enc,
-                                 &intel_dvo_enc_funcs, encoder_type);
-                drm_encoder_helper_add(&intel_encoder->enc,
+                drm_encoder_helper_add(&intel_encoder->base,
                                        &intel_dvo_helper_funcs);
 
-                drm_mode_connector_attach_encoder(&intel_connector->base,
-                                                  &intel_encoder->enc);
+                intel_connector_attach_encoder(intel_connector, intel_encoder);
                 if (dvo->type == INTEL_DVO_CHIP_LVDS) {
                         /* For our LVDS chipsets, we should hopefully be able
                          * to dig the fixed panel mode out of the BIOS data.
@@ -451,11 +442,7 @@ void intel_dvo_init(struct drm_device *dev)
                 return;
         }
 
-        intel_i2c_destroy(intel_encoder->ddc_bus);
-        /* Didn't find a chip, so tear down. */
-        if (i2cbus != NULL)
-                intel_i2c_destroy(i2cbus);
-free_intel:
+        drm_encoder_cleanup(&intel_encoder->base);
         kfree(intel_dvo);
         kfree(intel_connector);
 }