drm/i915: add DP support in LPE audio mode

If DisplayPort is detected, pass flag and link rate to audio driver

Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Acked-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>

diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
index 3e3102cedc824f98bfe2ba23d7fc8b117f3701f8..836d823d476bc85c26662069e4e409005abbdd32 100644 (file)
--- a/drivers/gpu/drm/i915/i915_drv.h
+++ b/drivers/gpu/drm/i915/i915_drv.h
@@ -3401,7 +3401,8 @@ int  intel_lpe_audio_init(struct drm_i915_private *dev_priv);
 void intel_lpe_audio_teardown(struct drm_i915_private *dev_priv);
 void intel_lpe_audio_irq_handler(struct drm_i915_private *dev_priv);
 void intel_lpe_audio_notify(struct drm_i915_private *dev_priv,
-                       void *eld, int port, int tmds_clk_speed);
+                           void *eld, int port, int tmds_clk_speed,
+                           bool dp_output, int link_rate);
 
 /* intel_i2c.c */
 extern int intel_setup_gmbus(struct drm_device *dev);

diff --git a/drivers/gpu/drm/i915/intel_audio.c b/drivers/gpu/drm/i915/intel_audio.c
index 364f96207c4000b34084a060438077cb363caac9..1645ce42b8983d942dcd2390419bf74005cdaf1b 100644 (file)
--- a/drivers/gpu/drm/i915/intel_audio.c
+++ b/drivers/gpu/drm/i915/intel_audio.c
@@ -631,9 +631,20 @@ void intel_audio_codec_enable(struct intel_encoder *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, (int) pipe);
-
-       intel_lpe_audio_notify(dev_priv, connector->eld, port,
-                       crtc_state->port_clock);
+       switch (intel_encoder->type) {
+       case INTEL_OUTPUT_HDMI:
+               intel_lpe_audio_notify(dev_priv, connector->eld, port,
+                                      crtc_state->port_clock,
+                                      false, 0);
+               break;
+       case INTEL_OUTPUT_DP:
+               intel_lpe_audio_notify(dev_priv, connector->eld, port,
+                                      adjusted_mode->crtc_clock,
+                                      true, crtc_state->port_clock);
+               break;
+       default:
+               break;
+       }
 }
 
 /**
@@ -668,7 +679,7 @@ void intel_audio_codec_disable(struct intel_encoder *intel_encoder)
                acomp->audio_ops->pin_eld_notify(acomp->audio_ops->audio_ptr,
                                                 (int) port, (int) pipe);
 
-       intel_lpe_audio_notify(dev_priv, NULL, port, 0);
+       intel_lpe_audio_notify(dev_priv, NULL, port, 0, false, 0);
 }
 
 /**

diff --git a/drivers/gpu/drm/i915/intel_lpe_audio.c b/drivers/gpu/drm/i915/intel_lpe_audio.c
index 27d94255872d1b0a94933aeb2ed75cb6bb79feca..245523e14418fc664c73da42aa17451dd9acc8a6 100644 (file)
--- a/drivers/gpu/drm/i915/intel_lpe_audio.c
+++ b/drivers/gpu/drm/i915/intel_lpe_audio.c
@@ -332,7 +332,8 @@ void intel_lpe_audio_teardown(struct drm_i915_private *dev_priv)
  * Notify lpe audio driver of eld change.
  */
 void intel_lpe_audio_notify(struct drm_i915_private *dev_priv,
-                       void *eld, int port, int tmds_clk_speed)
+                           void *eld, int port, int tmds_clk_speed,
+                           bool dp_output, int link_rate)
 {
        unsigned long irq_flags;
        struct intel_hdmi_lpe_audio_pdata *pdata = NULL;
@@ -351,12 +352,16 @@ void intel_lpe_audio_notify(struct drm_i915_private *dev_priv,
                pdata->eld.port_id = port;
                pdata->hdmi_connected = true;
 
+               pdata->dp_output = dp_output;
                if (tmds_clk_speed)
                        pdata->tmds_clock_speed = tmds_clk_speed;
+               if (link_rate)
+                       pdata->link_rate = link_rate;
        } else {
                memset(pdata->eld.eld_data, 0,
                        HDMI_MAX_ELD_BYTES);
                pdata->hdmi_connected = false;
+               pdata->dp_output = false;
        }
 
        if (pdata->notify_audio_lpe)

diff --git a/include/drm/intel_lpe_audio.h b/include/drm/intel_lpe_audio.h
index 952de05a9d76d50817345569b0920114b4980c95..857e0eafed79136a127cd3840102e72136842be2 100644 (file)
--- a/include/drm/intel_lpe_audio.h
+++ b/include/drm/intel_lpe_audio.h
@@ -38,6 +38,8 @@ struct intel_hdmi_lpe_audio_pdata {
        bool notify_pending;
        int tmds_clock_speed;
        bool hdmi_connected;
+       bool dp_output;
+       int link_rate;
        struct intel_hdmi_lpe_audio_eld eld;
        void (*notify_audio_lpe)(void *audio_ptr);
        spinlock_t lpe_audio_slock;