1 files changed, 37 insertions, 14 deletions

diff --git a/drivers/gpu/drm/i915/intel_audio.c b/drivers/gpu/drm/i915/intel_audio.c
index 2396cc702d18..3da9b8409f20 100644
--- a/drivers/gpu/drm/i915/intel_audio.c
+++ b/drivers/gpu/drm/i915/intel_audio.c
@@ -28,7 +28,6 @@
 
 #include <drm/drmP.h>
 #include <drm/drm_edid.h>
-#include "intel_drv.h"
 #include "i915_drv.h"
 
 /**
@@ -270,6 +269,9 @@ static void ilk_audio_codec_disable(struct intel_encoder *encoder)
         DRM_DEBUG_KMS("Disable audio codec on port %c, pipe %c\n",
                       port_name(port), pipe_name(pipe));
 
+        if (WARN_ON(port == PORT_A))
+                return;
+
         if (HAS_PCH_IBX(dev_priv->dev)) {
                 aud_config = IBX_AUD_CFG(pipe);
                 aud_cntrl_st2 = IBX_AUD_CNTL_ST2;
@@ -291,12 +293,7 @@ static void ilk_audio_codec_disable(struct intel_encoder *encoder)
                 tmp |= AUD_CONFIG_N_VALUE_INDEX;
         I915_WRITE(aud_config, tmp);
 
-        if (WARN_ON(!port)) {
-                eldv = IBX_ELD_VALID(PORT_B) | IBX_ELD_VALID(PORT_C) |
-                        IBX_ELD_VALID(PORT_D);
-        } else {
-                eldv = IBX_ELD_VALID(port);
-        }
+        eldv = IBX_ELD_VALID(port);
 
         /* Invalidate ELD */
         tmp = I915_READ(aud_cntrl_st2);
@@ -326,6 +323,9 @@ static void ilk_audio_codec_enable(struct drm_connector *connector,
         DRM_DEBUG_KMS("Enable audio codec on port %c, pipe %c, %u bytes ELD\n",
                       port_name(port), pipe_name(pipe), drm_eld_size(eld));
 
+        if (WARN_ON(port == PORT_A))
+                return;
+
         /*
          * FIXME: We're supposed to wait for vblank here, but we have vblanks
          * disabled during the mode set. The proper fix would be to push the
@@ -350,12 +350,7 @@ static void ilk_audio_codec_enable(struct drm_connector *connector,
                 aud_cntrl_st2 = CPT_AUD_CNTRL_ST2;
         }
 
-        if (WARN_ON(!port)) {
-                eldv = IBX_ELD_VALID(PORT_B) | IBX_ELD_VALID(PORT_C) |
-                        IBX_ELD_VALID(PORT_D);
-        } else {
-                eldv = IBX_ELD_VALID(port);
-        }
+        eldv = IBX_ELD_VALID(port);
 
         /* Invalidate ELD */
         tmp = I915_READ(aud_cntrl_st2);
@@ -475,6 +470,32 @@ static void i915_audio_component_put_power(struct device *dev)
         intel_display_power_put(dev_to_i915(dev), POWER_DOMAIN_AUDIO);
 }
 
+static void i915_audio_component_codec_wake_override(struct device *dev,
+                                                     bool enable)
+{
+        struct drm_i915_private *dev_priv = dev_to_i915(dev);
+        u32 tmp;
+
+        if (!IS_SKYLAKE(dev_priv))
+                return;
+
+        /*
+         * Enable/disable generating the codec wake signal, overriding the
+         * internal logic to generate the codec wake to controller.
+         */
+        tmp = I915_READ(HSW_AUD_CHICKENBIT);
+        tmp &= ~SKL_AUD_CODEC_WAKE_SIGNAL;
+        I915_WRITE(HSW_AUD_CHICKENBIT, tmp);
+        usleep_range(1000, 1500);
+
+        if (enable) {
+                tmp = I915_READ(HSW_AUD_CHICKENBIT);
+                tmp |= SKL_AUD_CODEC_WAKE_SIGNAL;
+                I915_WRITE(HSW_AUD_CHICKENBIT, tmp);
+                usleep_range(1000, 1500);
+        }
+}
+
 /* Get CDCLK in kHz  */
 static int i915_audio_component_get_cdclk_freq(struct device *dev)
 {
@@ -485,7 +506,8 @@ static int i915_audio_component_get_cdclk_freq(struct device *dev)
                 return -ENODEV;
 
         intel_display_power_get(dev_priv, POWER_DOMAIN_AUDIO);
-        ret = intel_ddi_get_cdclk_freq(dev_priv);
+        ret = dev_priv->display.get_display_clock_speed(dev_priv->dev);
+
         intel_display_power_put(dev_priv, POWER_DOMAIN_AUDIO);
 
         return ret;
@@ -495,6 +517,7 @@ static const struct i915_audio_component_ops i915_audio_component_ops = {
         .owner          = THIS_MODULE,
         .get_power      = i915_audio_component_get_power,
         .put_power      = i915_audio_component_put_power,
+        .codec_wake_override = i915_audio_component_codec_wake_override,
         .get_cdclk_freq = i915_audio_component_get_cdclk_freq,
 };