1 files changed, 28 insertions, 33 deletions

diff --git a/drivers/gpu/drm/i915/intel_dvo.c b/drivers/gpu/drm/i915/intel_dvo.c
index eb2020eb2b7e..406303b509c1 100644
--- a/drivers/gpu/drm/i915/intel_dvo.c
+++ b/drivers/gpu/drm/i915/intel_dvo.c
@@ -100,15 +100,14 @@ struct intel_dvo {
         bool panel_wants_dither;
 };
 
-static struct intel_dvo *enc_to_intel_dvo(struct drm_encoder *encoder)
+static struct intel_dvo *enc_to_dvo(struct intel_encoder *encoder)
 {
-        return container_of(encoder, struct intel_dvo, base.base);
+        return container_of(encoder, struct intel_dvo, base);
 }
 
 static struct intel_dvo *intel_attached_dvo(struct drm_connector *connector)
 {
-        return container_of(intel_attached_encoder(connector),
-                            struct intel_dvo, base);
+        return enc_to_dvo(intel_attached_encoder(connector));
 }
 
 static bool intel_dvo_connector_get_hw_state(struct intel_connector *connector)
@@ -123,7 +122,7 @@ static bool intel_dvo_get_hw_state(struct intel_encoder *encoder,
 {
         struct drm_device *dev = encoder->base.dev;
         struct drm_i915_private *dev_priv = dev->dev_private;
-        struct intel_dvo *intel_dvo = enc_to_intel_dvo(&encoder->base);
+        struct intel_dvo *intel_dvo = enc_to_dvo(encoder);
         u32 tmp;
 
         tmp = I915_READ(intel_dvo->dev.dvo_reg);
@@ -140,7 +139,7 @@ static void intel_dvo_get_config(struct intel_encoder *encoder,
                                  struct intel_crtc_config *pipe_config)
 {
         struct drm_i915_private *dev_priv = encoder->base.dev->dev_private;
-        struct intel_dvo *intel_dvo = enc_to_intel_dvo(&encoder->base);
+        struct intel_dvo *intel_dvo = enc_to_dvo(encoder);
         u32 tmp, flags = 0;
 
         tmp = I915_READ(intel_dvo->dev.dvo_reg);
@@ -159,7 +158,7 @@ static void intel_dvo_get_config(struct intel_encoder *encoder,
 static void intel_disable_dvo(struct intel_encoder *encoder)
 {
         struct drm_i915_private *dev_priv = encoder->base.dev->dev_private;
-        struct intel_dvo *intel_dvo = enc_to_intel_dvo(&encoder->base);
+        struct intel_dvo *intel_dvo = enc_to_dvo(encoder);
         u32 dvo_reg = intel_dvo->dev.dvo_reg;
         u32 temp = I915_READ(dvo_reg);
 
@@ -171,7 +170,7 @@ static void intel_disable_dvo(struct intel_encoder *encoder)
 static void intel_enable_dvo(struct intel_encoder *encoder)
 {
         struct drm_i915_private *dev_priv = encoder->base.dev->dev_private;
-        struct intel_dvo *intel_dvo = enc_to_intel_dvo(&encoder->base);
+        struct intel_dvo *intel_dvo = enc_to_dvo(encoder);
         u32 dvo_reg = intel_dvo->dev.dvo_reg;
         u32 temp = I915_READ(dvo_reg);
 
@@ -241,11 +240,11 @@ static int intel_dvo_mode_valid(struct drm_connector *connector,
         return intel_dvo->dev.dev_ops->mode_valid(&intel_dvo->dev, mode);
 }
 
-static bool intel_dvo_mode_fixup(struct drm_encoder *encoder,
-                                 const struct drm_display_mode *mode,
-                                 struct drm_display_mode *adjusted_mode)
+static bool intel_dvo_compute_config(struct intel_encoder *encoder,
+                                     struct intel_crtc_config *pipe_config)
 {
-        struct intel_dvo *intel_dvo = enc_to_intel_dvo(encoder);
+        struct intel_dvo *intel_dvo = enc_to_dvo(encoder);
+        struct drm_display_mode *adjusted_mode = &pipe_config->adjusted_mode;
 
         /* If we have timings from the BIOS for the panel, put them in
          * to the adjusted mode.  The CRTC will be set up for this mode,
@@ -267,23 +266,23 @@ static bool intel_dvo_mode_fixup(struct drm_encoder *encoder,
         }
 
         if (intel_dvo->dev.dev_ops->mode_fixup)
-                return intel_dvo->dev.dev_ops->mode_fixup(&intel_dvo->dev, mode, adjusted_mode);
+                return intel_dvo->dev.dev_ops->mode_fixup(&intel_dvo->dev,
+                                                          &pipe_config->requested_mode,
+                                                          adjusted_mode);
 
         return true;
 }
 
-static void intel_dvo_mode_set(struct drm_encoder *encoder,
-                               struct drm_display_mode *mode,
-                               struct drm_display_mode *adjusted_mode)
+static void intel_dvo_mode_set(struct intel_encoder *encoder)
 {
-        struct drm_device *dev = encoder->dev;
+        struct drm_device *dev = encoder->base.dev;
         struct drm_i915_private *dev_priv = dev->dev_private;
-        struct intel_crtc *intel_crtc = to_intel_crtc(encoder->crtc);
-        struct intel_dvo *intel_dvo = enc_to_intel_dvo(encoder);
-        int pipe = intel_crtc->pipe;
+        struct intel_crtc *crtc = to_intel_crtc(encoder->base.crtc);
+        struct drm_display_mode *adjusted_mode = &crtc->config.adjusted_mode;
+        struct intel_dvo *intel_dvo = enc_to_dvo(encoder);
+        int pipe = crtc->pipe;
         u32 dvo_val;
         u32 dvo_reg = intel_dvo->dev.dvo_reg, dvo_srcdim_reg;
-        int dpll_reg = DPLL(pipe);
 
         switch (dvo_reg) {
         case DVOA:
@@ -298,7 +297,9 @@ static void intel_dvo_mode_set(struct drm_encoder *encoder,
                 break;
         }
 
-        intel_dvo->dev.dev_ops->mode_set(&intel_dvo->dev, mode, adjusted_mode);
+        intel_dvo->dev.dev_ops->mode_set(&intel_dvo->dev,
+                                         &crtc->config.requested_mode,
+                                         adjusted_mode);
 
         /* Save the data order, since I don't know what it should be set to. */
         dvo_val = I915_READ(dvo_reg) &
@@ -314,8 +315,6 @@ static void intel_dvo_mode_set(struct drm_encoder *encoder,
         if (adjusted_mode->flags & DRM_MODE_FLAG_PVSYNC)
                 dvo_val |= DVO_VSYNC_ACTIVE_HIGH;
 
-        I915_WRITE(dpll_reg, I915_READ(dpll_reg) | DPLL_DVO_HIGH_SPEED);
-
         /*I915_WRITE(DVOB_SRCDIM,
           (adjusted_mode->hdisplay << DVO_SRCDIM_HORIZONTAL_SHIFT) |
           (adjusted_mode->VDisplay << DVO_SRCDIM_VERTICAL_SHIFT));*/
@@ -335,6 +334,8 @@ static enum drm_connector_status
 intel_dvo_detect(struct drm_connector *connector, bool force)
 {
         struct intel_dvo *intel_dvo = intel_attached_dvo(connector);
+        DRM_DEBUG_KMS("[CONNECTOR:%d:%s]\n",
+                      connector->base.id, drm_get_connector_name(connector));
         return intel_dvo->dev.dev_ops->detect(&intel_dvo->dev);
 }
 
@@ -372,11 +373,6 @@ static void intel_dvo_destroy(struct drm_connector *connector)
         kfree(connector);
 }
 
-static const struct drm_encoder_helper_funcs intel_dvo_helper_funcs = {
-        .mode_fixup = intel_dvo_mode_fixup,
-        .mode_set = intel_dvo_mode_set,
-};
-
 static const struct drm_connector_funcs intel_dvo_connector_funcs = {
         .dpms = intel_dvo_dpms,
         .detect = intel_dvo_detect,
@@ -392,7 +388,7 @@ static const struct drm_connector_helper_funcs intel_dvo_connector_helper_funcs
 
 static void intel_dvo_enc_destroy(struct drm_encoder *encoder)
 {
-        struct intel_dvo *intel_dvo = enc_to_intel_dvo(encoder);
+        struct intel_dvo *intel_dvo = enc_to_dvo(to_intel_encoder(encoder));
 
         if (intel_dvo->dev.dev_ops->destroy)
                 intel_dvo->dev.dev_ops->destroy(&intel_dvo->dev);
@@ -471,6 +467,8 @@ void intel_dvo_init(struct drm_device *dev)
         intel_encoder->enable = intel_enable_dvo;
         intel_encoder->get_hw_state = intel_dvo_get_hw_state;
         intel_encoder->get_config = intel_dvo_get_config;
+        intel_encoder->compute_config = intel_dvo_compute_config;
+        intel_encoder->mode_set = intel_dvo_mode_set;
         intel_connector->get_hw_state = intel_dvo_connector_get_hw_state;
 
         /* Now, try to find a controller */
@@ -537,9 +535,6 @@ void intel_dvo_init(struct drm_device *dev)
                 connector->interlace_allowed = false;
                 connector->doublescan_allowed = false;
 
-                drm_encoder_helper_add(&intel_encoder->base,
-                                       &intel_dvo_helper_funcs);
-
                 intel_connector_attach_encoder(intel_connector, intel_encoder);
                 if (dvo->type == INTEL_DVO_CHIP_LVDS) {
                         /* For our LVDS chipsets, we should hopefully be able