1 files changed, 39 insertions, 155 deletions

diff --git a/drivers/gpu/drm/i915/intel_tv.c b/drivers/gpu/drm/i915/intel_tv.c
index d7d39b2327df..081cb9014525 100644
--- a/drivers/gpu/drm/i915/intel_tv.c
+++ b/drivers/gpu/drm/i915/intel_tv.c
@@ -916,143 +916,6 @@ intel_tv_dpms(struct drm_encoder *encoder, int mode)
         }
 }
 
-static void
-intel_tv_save(struct drm_connector *connector)
-{
-        struct drm_device *dev = connector->dev;
-        struct drm_i915_private *dev_priv = dev->dev_private;
-        struct intel_encoder *intel_encoder = to_intel_encoder(connector);
-        struct intel_tv_priv *tv_priv = intel_encoder->dev_priv;
-        int i;
-
-        tv_priv->save_TV_H_CTL_1 = I915_READ(TV_H_CTL_1);
-        tv_priv->save_TV_H_CTL_2 = I915_READ(TV_H_CTL_2);
-        tv_priv->save_TV_H_CTL_3 = I915_READ(TV_H_CTL_3);
-        tv_priv->save_TV_V_CTL_1 = I915_READ(TV_V_CTL_1);
-        tv_priv->save_TV_V_CTL_2 = I915_READ(TV_V_CTL_2);
-        tv_priv->save_TV_V_CTL_3 = I915_READ(TV_V_CTL_3);
-        tv_priv->save_TV_V_CTL_4 = I915_READ(TV_V_CTL_4);
-        tv_priv->save_TV_V_CTL_5 = I915_READ(TV_V_CTL_5);
-        tv_priv->save_TV_V_CTL_6 = I915_READ(TV_V_CTL_6);
-        tv_priv->save_TV_V_CTL_7 = I915_READ(TV_V_CTL_7);
-        tv_priv->save_TV_SC_CTL_1 = I915_READ(TV_SC_CTL_1);
-        tv_priv->save_TV_SC_CTL_2 = I915_READ(TV_SC_CTL_2);
-        tv_priv->save_TV_SC_CTL_3 = I915_READ(TV_SC_CTL_3);
-
-        tv_priv->save_TV_CSC_Y = I915_READ(TV_CSC_Y);
-        tv_priv->save_TV_CSC_Y2 = I915_READ(TV_CSC_Y2);
-        tv_priv->save_TV_CSC_U = I915_READ(TV_CSC_U);
-        tv_priv->save_TV_CSC_U2 = I915_READ(TV_CSC_U2);
-        tv_priv->save_TV_CSC_V = I915_READ(TV_CSC_V);
-        tv_priv->save_TV_CSC_V2 = I915_READ(TV_CSC_V2);
-        tv_priv->save_TV_CLR_KNOBS = I915_READ(TV_CLR_KNOBS);
-        tv_priv->save_TV_CLR_LEVEL = I915_READ(TV_CLR_LEVEL);
-        tv_priv->save_TV_WIN_POS = I915_READ(TV_WIN_POS);
-        tv_priv->save_TV_WIN_SIZE = I915_READ(TV_WIN_SIZE);
-        tv_priv->save_TV_FILTER_CTL_1 = I915_READ(TV_FILTER_CTL_1);
-        tv_priv->save_TV_FILTER_CTL_2 = I915_READ(TV_FILTER_CTL_2);
-        tv_priv->save_TV_FILTER_CTL_3 = I915_READ(TV_FILTER_CTL_3);
-
-        for (i = 0; i < 60; i++)
-                tv_priv->save_TV_H_LUMA[i] = I915_READ(TV_H_LUMA_0 + (i <<2));
-        for (i = 0; i < 60; i++)
-                tv_priv->save_TV_H_CHROMA[i] = I915_READ(TV_H_CHROMA_0 + (i <<2));
-        for (i = 0; i < 43; i++)
-                tv_priv->save_TV_V_LUMA[i] = I915_READ(TV_V_LUMA_0 + (i <<2));
-        for (i = 0; i < 43; i++)
-                tv_priv->save_TV_V_CHROMA[i] = I915_READ(TV_V_CHROMA_0 + (i <<2));
-
-        tv_priv->save_TV_DAC = I915_READ(TV_DAC);
-        tv_priv->save_TV_CTL = I915_READ(TV_CTL);
-}
-
-static void
-intel_tv_restore(struct drm_connector *connector)
-{
-        struct drm_device *dev = connector->dev;
-        struct drm_i915_private *dev_priv = dev->dev_private;
-        struct intel_encoder *intel_encoder = to_intel_encoder(connector);
-        struct intel_tv_priv *tv_priv = intel_encoder->dev_priv;
-        struct drm_crtc *crtc = connector->encoder->crtc;
-        struct intel_crtc *intel_crtc;
-        int i;
-
-        /* FIXME: No CRTC? */
-        if (!crtc)
-                return;
-
-        intel_crtc = to_intel_crtc(crtc);
-        I915_WRITE(TV_H_CTL_1, tv_priv->save_TV_H_CTL_1);
-        I915_WRITE(TV_H_CTL_2, tv_priv->save_TV_H_CTL_2);
-        I915_WRITE(TV_H_CTL_3, tv_priv->save_TV_H_CTL_3);
-        I915_WRITE(TV_V_CTL_1, tv_priv->save_TV_V_CTL_1);
-        I915_WRITE(TV_V_CTL_2, tv_priv->save_TV_V_CTL_2);
-        I915_WRITE(TV_V_CTL_3, tv_priv->save_TV_V_CTL_3);
-        I915_WRITE(TV_V_CTL_4, tv_priv->save_TV_V_CTL_4);
-        I915_WRITE(TV_V_CTL_5, tv_priv->save_TV_V_CTL_5);
-        I915_WRITE(TV_V_CTL_6, tv_priv->save_TV_V_CTL_6);
-        I915_WRITE(TV_V_CTL_7, tv_priv->save_TV_V_CTL_7);
-        I915_WRITE(TV_SC_CTL_1, tv_priv->save_TV_SC_CTL_1);
-        I915_WRITE(TV_SC_CTL_2, tv_priv->save_TV_SC_CTL_2);
-        I915_WRITE(TV_SC_CTL_3, tv_priv->save_TV_SC_CTL_3);
-
-        I915_WRITE(TV_CSC_Y, tv_priv->save_TV_CSC_Y);
-        I915_WRITE(TV_CSC_Y2, tv_priv->save_TV_CSC_Y2);
-        I915_WRITE(TV_CSC_U, tv_priv->save_TV_CSC_U);
-        I915_WRITE(TV_CSC_U2, tv_priv->save_TV_CSC_U2);
-        I915_WRITE(TV_CSC_V, tv_priv->save_TV_CSC_V);
-        I915_WRITE(TV_CSC_V2, tv_priv->save_TV_CSC_V2);
-        I915_WRITE(TV_CLR_KNOBS, tv_priv->save_TV_CLR_KNOBS);
-        I915_WRITE(TV_CLR_LEVEL, tv_priv->save_TV_CLR_LEVEL);
-
-        {
-                int pipeconf_reg = (intel_crtc->pipe == 0) ?
-                        PIPEACONF : PIPEBCONF;
-                int dspcntr_reg = (intel_crtc->plane == 0) ?
-                        DSPACNTR : DSPBCNTR;
-                int pipeconf = I915_READ(pipeconf_reg);
-                int dspcntr = I915_READ(dspcntr_reg);
-                int dspbase_reg = (intel_crtc->plane == 0) ?
-                        DSPAADDR : DSPBADDR;
-                /* Pipe must be off here */
-                I915_WRITE(dspcntr_reg, dspcntr & ~DISPLAY_PLANE_ENABLE);
-                /* Flush the plane changes */
-                I915_WRITE(dspbase_reg, I915_READ(dspbase_reg));
-
-                if (!IS_I9XX(dev)) {
-                        /* Wait for vblank for the disable to take effect */
-                        intel_wait_for_vblank(dev);
-                }
-
-                I915_WRITE(pipeconf_reg, pipeconf & ~PIPEACONF_ENABLE);
-                /* Wait for vblank for the disable to take effect. */
-                intel_wait_for_vblank(dev);
-
-                /* Filter ctl must be set before TV_WIN_SIZE */
-                I915_WRITE(TV_FILTER_CTL_1, tv_priv->save_TV_FILTER_CTL_1);
-                I915_WRITE(TV_FILTER_CTL_2, tv_priv->save_TV_FILTER_CTL_2);
-                I915_WRITE(TV_FILTER_CTL_3, tv_priv->save_TV_FILTER_CTL_3);
-                I915_WRITE(TV_WIN_POS, tv_priv->save_TV_WIN_POS);
-                I915_WRITE(TV_WIN_SIZE, tv_priv->save_TV_WIN_SIZE);
-                I915_WRITE(pipeconf_reg, pipeconf);
-                I915_WRITE(dspcntr_reg, dspcntr);
-                /* Flush the plane changes */
-                I915_WRITE(dspbase_reg, I915_READ(dspbase_reg));
-        }
-
-        for (i = 0; i < 60; i++)
-                I915_WRITE(TV_H_LUMA_0 + (i <<2), tv_priv->save_TV_H_LUMA[i]);
-        for (i = 0; i < 60; i++)
-                I915_WRITE(TV_H_CHROMA_0 + (i <<2), tv_priv->save_TV_H_CHROMA[i]);
-        for (i = 0; i < 43; i++)
-                I915_WRITE(TV_V_LUMA_0 + (i <<2), tv_priv->save_TV_V_LUMA[i]);
-        for (i = 0; i < 43; i++)
-                I915_WRITE(TV_V_CHROMA_0 + (i <<2), tv_priv->save_TV_V_CHROMA[i]);
-
-        I915_WRITE(TV_DAC, tv_priv->save_TV_DAC);
-        I915_WRITE(TV_CTL, tv_priv->save_TV_CTL);
-}
-
 static const struct tv_mode *
 intel_tv_mode_lookup (char *tv_format)
 {
@@ -1078,7 +941,8 @@ intel_tv_mode_find (struct intel_encoder *intel_encoder)
 static enum drm_mode_status
 intel_tv_mode_valid(struct drm_connector *connector, struct drm_display_mode *mode)
 {
-        struct intel_encoder *intel_encoder = to_intel_encoder(connector);
+        struct drm_encoder *encoder = intel_attached_encoder(connector);
+        struct intel_encoder *intel_encoder = enc_to_intel_encoder(encoder);
         const struct tv_mode *tv_mode = intel_tv_mode_find(intel_encoder);
 
         /* Ensure TV refresh is close to desired refresh */
@@ -1399,6 +1263,15 @@ intel_tv_detect_type (struct drm_crtc *crtc, struct intel_encoder *intel_encoder
                    DAC_A_0_7_V |
                    DAC_B_0_7_V |
                    DAC_C_0_7_V);
+
+        /*
+         * The TV sense state should be cleared to zero on cantiga platform. Otherwise
+         * the TV is misdetected. This is hardware requirement.
+         */
+        if (IS_GM45(dev))
+                tv_dac &= ~(TVDAC_STATE_CHG_EN | TVDAC_A_SENSE_CTL |
+                            TVDAC_B_SENSE_CTL | TVDAC_C_SENSE_CTL);
+
         I915_WRITE(TV_CTL, tv_ctl);
         I915_WRITE(TV_DAC, tv_dac);
         intel_wait_for_vblank(dev);
@@ -1441,7 +1314,8 @@ intel_tv_detect_type (struct drm_crtc *crtc, struct intel_encoder *intel_encoder
  */
 static void intel_tv_find_better_format(struct drm_connector *connector)
 {
-        struct intel_encoder *intel_encoder = to_intel_encoder(connector);
+        struct drm_encoder *encoder = intel_attached_encoder(connector);
+        struct intel_encoder *intel_encoder = enc_to_intel_encoder(encoder);
         struct intel_tv_priv *tv_priv = intel_encoder->dev_priv;
         const struct tv_mode *tv_mode = intel_tv_mode_find(intel_encoder);
         int i;
@@ -1475,9 +1349,9 @@ intel_tv_detect(struct drm_connector *connector)
 {
         struct drm_crtc *crtc;
         struct drm_display_mode mode;
-        struct intel_encoder *intel_encoder = to_intel_encoder(connector);
+        struct drm_encoder *encoder = intel_attached_encoder(connector);
+        struct intel_encoder *intel_encoder = enc_to_intel_encoder(encoder);
         struct intel_tv_priv *tv_priv = intel_encoder->dev_priv;
-        struct drm_encoder *encoder = &intel_encoder->enc;
         int dpms_mode;
         int type = tv_priv->type;
 
@@ -1487,10 +1361,12 @@ intel_tv_detect(struct drm_connector *connector)
         if (encoder->crtc && encoder->crtc->enabled) {
                 type = intel_tv_detect_type(encoder->crtc, intel_encoder);
         } else {
-                crtc = intel_get_load_detect_pipe(intel_encoder, &mode, &dpms_mode);
+                crtc = intel_get_load_detect_pipe(intel_encoder, connector,
+                                                  &mode, &dpms_mode);
                 if (crtc) {
                         type = intel_tv_detect_type(crtc, intel_encoder);
-                        intel_release_load_detect_pipe(intel_encoder, dpms_mode);
+                        intel_release_load_detect_pipe(intel_encoder, connector,
+                                                       dpms_mode);
                 } else
                         type = -1;
         }
@@ -1525,7 +1401,8 @@ static void
 intel_tv_chose_preferred_modes(struct drm_connector *connector,
                                struct drm_display_mode *mode_ptr)
 {
-        struct intel_encoder *intel_encoder = to_intel_encoder(connector);
+        struct drm_encoder *encoder = intel_attached_encoder(connector);
+        struct intel_encoder *intel_encoder = enc_to_intel_encoder(encoder);
         const struct tv_mode *tv_mode = intel_tv_mode_find(intel_encoder);
 
         if (tv_mode->nbr_end < 480 && mode_ptr->vdisplay == 480)
@@ -1550,7 +1427,8 @@ static int
 intel_tv_get_modes(struct drm_connector *connector)
 {
         struct drm_display_mode *mode_ptr;
-        struct intel_encoder *intel_encoder = to_intel_encoder(connector);
+        struct drm_encoder *encoder = intel_attached_encoder(connector);
+        struct intel_encoder *intel_encoder = enc_to_intel_encoder(encoder);
         const struct tv_mode *tv_mode = intel_tv_mode_find(intel_encoder);
         int j, count = 0;
         u64 tmp;
@@ -1604,11 +1482,9 @@ intel_tv_get_modes(struct drm_connector *connector)
 static void
 intel_tv_destroy (struct drm_connector *connector)
 {
-        struct intel_encoder *intel_encoder = to_intel_encoder(connector);
-
         drm_sysfs_connector_remove(connector);
         drm_connector_cleanup(connector);
-        kfree(intel_encoder);
+        kfree(connector);
 }
 
 
@@ -1617,9 +1493,9 @@ intel_tv_set_property(struct drm_connector *connector, struct drm_property *prop
                       uint64_t val)
 {
         struct drm_device *dev = connector->dev;
-        struct intel_encoder *intel_encoder = to_intel_encoder(connector);
+        struct drm_encoder *encoder = intel_attached_encoder(connector);
+        struct intel_encoder *intel_encoder = enc_to_intel_encoder(encoder);
         struct intel_tv_priv *tv_priv = intel_encoder->dev_priv;
-        struct drm_encoder *encoder = &intel_encoder->enc;
         struct drm_crtc *crtc = encoder->crtc;
         int ret = 0;
         bool changed = false;
@@ -1676,8 +1552,6 @@ static const struct drm_encoder_helper_funcs intel_tv_helper_funcs = {
 
 static const struct drm_connector_funcs intel_tv_connector_funcs = {
         .dpms = drm_helper_connector_dpms,
-        .save = intel_tv_save,
-        .restore = intel_tv_restore,
         .detect = intel_tv_detect,
         .destroy = intel_tv_destroy,
         .set_property = intel_tv_set_property,
@@ -1687,12 +1561,15 @@ static const struct drm_connector_funcs intel_tv_connector_funcs = {
 static const struct drm_connector_helper_funcs intel_tv_connector_helper_funcs = {
         .mode_valid = intel_tv_mode_valid,
         .get_modes = intel_tv_get_modes,
-        .best_encoder = intel_best_encoder,
+        .best_encoder = intel_attached_encoder,
 };
 
 static void intel_tv_enc_destroy(struct drm_encoder *encoder)
 {
+        struct intel_encoder *intel_encoder = enc_to_intel_encoder(encoder);
+
         drm_encoder_cleanup(encoder);
+        kfree(intel_encoder);
 }
 
 static const struct drm_encoder_funcs intel_tv_enc_funcs = {
@@ -1741,6 +1618,7 @@ intel_tv_init(struct drm_device *dev)
         struct drm_i915_private *dev_priv = dev->dev_private;
         struct drm_connector *connector;
         struct intel_encoder *intel_encoder;
+        struct intel_connector *intel_connector;
         struct intel_tv_priv *tv_priv;
         u32 tv_dac_on, tv_dac_off, save_tv_dac;
         char **tv_format_names;
@@ -1786,7 +1664,13 @@ intel_tv_init(struct drm_device *dev)
                 return;
         }
 
-        connector = &intel_encoder->base;
+        intel_connector = kzalloc(sizeof(struct intel_connector), GFP_KERNEL);
+        if (!intel_connector) {
+                kfree(intel_encoder);
+                return;
+        }
+
+        connector = &intel_connector->base;
 
         drm_connector_init(dev, connector, &intel_tv_connector_funcs,
                            DRM_MODE_CONNECTOR_SVIDEO);
@@ -1794,7 +1678,7 @@ intel_tv_init(struct drm_device *dev)
         drm_encoder_init(dev, &intel_encoder->enc, &intel_tv_enc_funcs,
                          DRM_MODE_ENCODER_TVDAC);
 
-        drm_mode_connector_attach_encoder(&intel_encoder->base, &intel_encoder->enc);
+        drm_mode_connector_attach_encoder(&intel_connector->base, &intel_encoder->enc);
         tv_priv = (struct intel_tv_priv *)(intel_encoder + 1);
         intel_encoder->type = INTEL_OUTPUT_TVOUT;
         intel_encoder->crtc_mask = (1 << 0) | (1 << 1);