drm/i915/hdmi: convert to encoder->disable/enable

I've picked hdmi as the first encoder to convert because it's rather
simple:
- no cloning possible
- no differences between prepare/commit and dpms off/on switching.

A few changes are required to do so:
- Split up the dpms code into an enable/disable function and wire it
  up with the intel encoder.
- Noop out the existing encoder prepare/commit functions used by the
  crtc helper - our crtc enable/disable code now calls back into the
  encoder enable/disable code at the right spot.
- Create new helper functions to handle dpms changes.
- Add intel_encoder->connectors_active to better track dpms state. Atm
  this is unused, but it will be useful to correctly disable the
  entire display pipe for cloned configurations. Also note that for
  now this is only useful in the dpms code - thanks to the crtc
  helper's dpms confusion across a modeset operation we can't (yet)
  rely on this having a sensible value in all circumstances.
- Rip out the encoder helper dpms callback, if this is still getting
  called somewhere we have a bug. The slight issue with that is that
  the crtc helper abuses dpms off to disable unused functions. Hence
  we also need to implement a default encoder disable function to do
  just that with the new encoder->disable callback.
- Note that we drop the cpt modeset verification in the commit
  callback, too. The right place to do this would be in the crtc's
  enable function, _after_ all the encoders are set up. But because
  not all encoders are converted yet, we can't do that. Hence disable
  this check temporarily as a minor concession to bisectability.

v2: Squash the dpms mode to only the supported values -
connector->dpms is for internal tracking only, we can hence avoid
needless state-changes a bit whithout causing harm.

v3: Apply bikeshed to disable|enable_ddi, suggested by Paulo Zanoni.

Reviewed-by: Jesse Barnes <jbarnes@virtuousgeek.org>
Signed-Off-by: Daniel Vetter <daniel.vetter@ffwll.ch>

1 files changed, 85 insertions, 41 deletions

diff --git a/drivers/gpu/drm/i915/intel_hdmi.c b/drivers/gpu/drm/i915/intel_hdmi.c
index e4c37bb572e8..acddaaa5f04c 100644
--- a/drivers/gpu/drm/i915/intel_hdmi.c
+++ b/drivers/gpu/drm/i915/intel_hdmi.c
@@ -601,11 +601,11 @@ static void intel_hdmi_mode_set(struct drm_encoder *encoder,
         intel_hdmi->set_infoframes(encoder, adjusted_mode);
 }
 
-static void intel_hdmi_dpms(struct drm_encoder *encoder, int mode)
+static void intel_enable_hdmi(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_hdmi *intel_hdmi = enc_to_intel_hdmi(encoder);
+        struct intel_hdmi *intel_hdmi = enc_to_intel_hdmi(&encoder->base);
         u32 temp;
         u32 enable_bits = SDVO_ENABLE;
 
@@ -617,31 +617,12 @@ static void intel_hdmi_dpms(struct drm_encoder *encoder, int mode)
         /* HW workaround for IBX, we need to move the port to transcoder A
          * before disabling it. */
         if (HAS_PCH_IBX(dev)) {
-                struct drm_crtc *crtc = encoder->crtc;
+                struct drm_crtc *crtc = encoder->base.crtc;
                 int pipe = crtc ? to_intel_crtc(crtc)->pipe : -1;
 
-                if (mode != DRM_MODE_DPMS_ON) {
-                        if (temp & SDVO_PIPE_B_SELECT) {
-                                temp &= ~SDVO_PIPE_B_SELECT;
-                                I915_WRITE(intel_hdmi->sdvox_reg, temp);
-                                POSTING_READ(intel_hdmi->sdvox_reg);
-
-                                /* Again we need to write this twice. */
-                                I915_WRITE(intel_hdmi->sdvox_reg, temp);
-                                POSTING_READ(intel_hdmi->sdvox_reg);
-
-                                /* Transcoder selection bits only update
-                                 * effectively on vblank. */
-                                if (crtc)
-                                        intel_wait_for_vblank(dev, pipe);
-                                else
-                                        msleep(50);
-                        }
-                } else {
-                        /* Restore the transcoder select bit. */
-                        if (pipe == PIPE_B)
-                                enable_bits |= SDVO_PIPE_B_SELECT;
-                }
+                /* Restore the transcoder select bit. */
+                if (pipe == PIPE_B)
+                        enable_bits |= SDVO_PIPE_B_SELECT;
         }
 
         /* HW workaround, need to toggle enable bit off and on for 12bpc, but
@@ -652,12 +633,67 @@ static void intel_hdmi_dpms(struct drm_encoder *encoder, int mode)
                 POSTING_READ(intel_hdmi->sdvox_reg);
         }
 
-        if (mode != DRM_MODE_DPMS_ON) {
-                temp &= ~enable_bits;
-        } else {
-                temp |= enable_bits;
+        temp |= enable_bits;
+
+        I915_WRITE(intel_hdmi->sdvox_reg, temp);
+        POSTING_READ(intel_hdmi->sdvox_reg);
+
+        /* HW workaround, need to write this twice for issue that may result
+         * in first write getting masked.
+         */
+        if (HAS_PCH_SPLIT(dev)) {
+                I915_WRITE(intel_hdmi->sdvox_reg, temp);
+                POSTING_READ(intel_hdmi->sdvox_reg);
+        }
+}
+
+static void intel_disable_hdmi(struct intel_encoder *encoder)
+{
+        struct drm_device *dev = encoder->base.dev;
+        struct drm_i915_private *dev_priv = dev->dev_private;
+        struct intel_hdmi *intel_hdmi = enc_to_intel_hdmi(&encoder->base);
+        u32 temp;
+        u32 enable_bits = SDVO_ENABLE;
+
+        if (intel_hdmi->has_audio)
+                enable_bits |= SDVO_AUDIO_ENABLE;
+
+        temp = I915_READ(intel_hdmi->sdvox_reg);
+
+        /* HW workaround for IBX, we need to move the port to transcoder A
+         * before disabling it. */
+        if (HAS_PCH_IBX(dev)) {
+                struct drm_crtc *crtc = encoder->base.crtc;
+                int pipe = crtc ? to_intel_crtc(crtc)->pipe : -1;
+
+                if (temp & SDVO_PIPE_B_SELECT) {
+                        temp &= ~SDVO_PIPE_B_SELECT;
+                        I915_WRITE(intel_hdmi->sdvox_reg, temp);
+                        POSTING_READ(intel_hdmi->sdvox_reg);
+
+                        /* Again we need to write this twice. */
+                        I915_WRITE(intel_hdmi->sdvox_reg, temp);
+                        POSTING_READ(intel_hdmi->sdvox_reg);
+
+                        /* Transcoder selection bits only update
+                         * effectively on vblank. */
+                        if (crtc)
+                                intel_wait_for_vblank(dev, pipe);
+                        else
+                                msleep(50);
+                }
         }
 
+        /* HW workaround, need to toggle enable bit off and on for 12bpc, but
+         * we do this anyway which shows more stable in testing.
+         */
+        if (HAS_PCH_SPLIT(dev)) {
+                I915_WRITE(intel_hdmi->sdvox_reg, temp & ~SDVO_ENABLE);
+                POSTING_READ(intel_hdmi->sdvox_reg);
+        }
+
+        temp &= ~enable_bits;
+
         I915_WRITE(intel_hdmi->sdvox_reg, temp);
         POSTING_READ(intel_hdmi->sdvox_reg);
 
@@ -849,23 +885,23 @@ static void intel_hdmi_destroy(struct drm_connector *connector)
 }
 
 static const struct drm_encoder_helper_funcs intel_hdmi_helper_funcs_hsw = {
-        .dpms = intel_ddi_dpms,
         .mode_fixup = intel_hdmi_mode_fixup,
-        .prepare = intel_encoder_prepare,
+        .prepare = intel_encoder_noop,
         .mode_set = intel_ddi_mode_set,
-        .commit = intel_encoder_commit,
+        .commit = intel_encoder_noop,
+        .disable = intel_encoder_disable,
 };
 
 static const struct drm_encoder_helper_funcs intel_hdmi_helper_funcs = {
-        .dpms = intel_hdmi_dpms,
         .mode_fixup = intel_hdmi_mode_fixup,
-        .prepare = intel_encoder_prepare,
+        .prepare = intel_encoder_noop,
         .mode_set = intel_hdmi_mode_set,
-        .commit = intel_encoder_commit,
+        .commit = intel_encoder_noop,
+        .disable = intel_encoder_disable,
 };
 
 static const struct drm_connector_funcs intel_hdmi_connector_funcs = {
-        .dpms = drm_helper_connector_dpms,
+        .dpms = intel_connector_dpms,
         .detect = intel_hdmi_detect,
         .fill_modes = drm_helper_probe_single_connector_modes,
         .set_property = intel_hdmi_set_property,
@@ -964,10 +1000,18 @@ void intel_hdmi_init(struct drm_device *dev, int sdvox_reg, enum port port)
                 intel_hdmi->set_infoframes = cpt_set_infoframes;
         }
 
-        if (IS_HASWELL(dev))
-                drm_encoder_helper_add(&intel_encoder->base, &intel_hdmi_helper_funcs_hsw);
-        else
-                drm_encoder_helper_add(&intel_encoder->base, &intel_hdmi_helper_funcs);
+        if (IS_HASWELL(dev)) {
+                intel_encoder->enable = intel_enable_ddi;
+                intel_encoder->disable = intel_disable_ddi;
+                drm_encoder_helper_add(&intel_encoder->base,
+                                       &intel_hdmi_helper_funcs_hsw);
+        } else {
+                intel_encoder->enable = intel_enable_hdmi;
+                intel_encoder->disable = intel_disable_hdmi;
+                drm_encoder_helper_add(&intel_encoder->base,
+                                       &intel_hdmi_helper_funcs);
+        }
+
 
         intel_hdmi_add_properties(intel_hdmi, connector);