Merge tag 'v4.3-rc2' into topic/drm-misc

[karo-tx-linux.git] / drivers / gpu / drm / i915 / intel_audio.c

diff --git a/drivers/gpu/drm/i915/intel_audio.c b/drivers/gpu/drm/i915/intel_audio.c
index 1314ebb282e4fe9cf9143bc1a337303a83f12e9c..f73de0bef584497bf4532e86d745f72f14b2d6cb 100644 (file)
--- a/drivers/gpu/drm/i915/intel_audio.c
+++ b/drivers/gpu/drm/i915/intel_audio.c
@@ -400,6 +400,9 @@ void intel_audio_codec_enable(struct intel_encoder *intel_encoder)
        struct drm_connector *connector;
        struct drm_device *dev = encoder->dev;
        struct drm_i915_private *dev_priv = dev->dev_private;
+       struct i915_audio_component *acomp = dev_priv->audio_component;
+       struct intel_digital_port *intel_dig_port = enc_to_dig_port(encoder);
+       enum port port = intel_dig_port->port;
 
        connector = drm_select_eld(encoder);
        if (!connector)
@@ -420,6 +423,9 @@ void intel_audio_codec_enable(struct intel_encoder *intel_encoder)
 
        if (dev_priv->display.audio_codec_enable)
                dev_priv->display.audio_codec_enable(connector, intel_encoder, mode);
+
+       if (acomp && acomp->audio_ops && acomp->audio_ops->pin_eld_notify)
+               acomp->audio_ops->pin_eld_notify(acomp->audio_ops->audio_ptr, (int) port);
 }
 
 /**
@@ -429,13 +435,20 @@ void intel_audio_codec_enable(struct intel_encoder *intel_encoder)
  * The disable sequences must be performed before disabling the transcoder or
  * port.
  */
-void intel_audio_codec_disable(struct intel_encoder *encoder)
+void intel_audio_codec_disable(struct intel_encoder *intel_encoder)
 {
-       struct drm_device *dev = encoder->base.dev;
+       struct drm_encoder *encoder = &intel_encoder->base;
+       struct drm_device *dev = encoder->dev;
        struct drm_i915_private *dev_priv = dev->dev_private;
+       struct i915_audio_component *acomp = dev_priv->audio_component;
+       struct intel_digital_port *intel_dig_port = enc_to_dig_port(encoder);
+       enum port port = intel_dig_port->port;
 
        if (dev_priv->display.audio_codec_disable)
-               dev_priv->display.audio_codec_disable(encoder);
+               dev_priv->display.audio_codec_disable(intel_encoder);
+
+       if (acomp && acomp->audio_ops && acomp->audio_ops->pin_eld_notify)
+               acomp->audio_ops->pin_eld_notify(acomp->audio_ops->audio_ptr, (int) port);
 }
 
 /**
@@ -526,12 +539,16 @@ static int i915_audio_component_bind(struct device *i915_dev,
                                     struct device *hda_dev, void *data)
 {
        struct i915_audio_component *acomp = data;
+       struct drm_i915_private *dev_priv = dev_to_i915(i915_dev);
 
        if (WARN_ON(acomp->ops || acomp->dev))
                return -EEXIST;
 
+       drm_modeset_lock_all(dev_priv->dev);
        acomp->ops = &i915_audio_component_ops;
        acomp->dev = i915_dev;
+       dev_priv->audio_component = acomp;
+       drm_modeset_unlock_all(dev_priv->dev);
 
        return 0;
 }
@@ -540,9 +557,13 @@ static void i915_audio_component_unbind(struct device *i915_dev,
                                        struct device *hda_dev, void *data)
 {
        struct i915_audio_component *acomp = data;
+       struct drm_i915_private *dev_priv = dev_to_i915(i915_dev);
 
+       drm_modeset_lock_all(dev_priv->dev);
        acomp->ops = NULL;
        acomp->dev = NULL;
+       dev_priv->audio_component = NULL;
+       drm_modeset_unlock_all(dev_priv->dev);
 }
 
 static const struct component_ops i915_audio_component_bind_ops = {