[V3,2/2] drm/i915: start adding dp mst audio

Submitted by libin.yang@linux.intel.com on Nov. 25, 2015, 5:19 a.m.

Details

Message ID 1448428740-73765-2-git-send-email-libin.yang@linux.intel.com
State New
Headers show
Series "Series without cover letter" ( rev: 1 ) in Intel GFX

Not browsing as part of any series.

Commit Message

libin.yang@linux.intel.com Nov. 25, 2015, 5:19 a.m.
From: Libin Yang <libin.yang@linux.intel.com>

This patch adds support for DP MST audio in i915.

Enable audio codec when DP MST is enabled if has_audio flag is set.
Disable audio codec when DP MST is disabled if has_audio flag is set.

Signed-off-by: Libin Yang <libin.yang@linux.intel.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
---
 drivers/gpu/drm/i915/i915_debugfs.c | 16 ++++++++++++++++
 drivers/gpu/drm/i915/intel_audio.c  |  9 ++++++---
 drivers/gpu/drm/i915/intel_ddi.c    | 19 ++++++++++++++-----
 drivers/gpu/drm/i915/intel_dp_mst.c | 21 +++++++++++++++++++++
 drivers/gpu/drm/i915/intel_drv.h    |  3 +++
 5 files changed, 60 insertions(+), 8 deletions(-)

Patch hide | download patch | download mbox

diff --git a/drivers/gpu/drm/i915/i915_debugfs.c b/drivers/gpu/drm/i915/i915_debugfs.c
index 5659d4c..bc5a27e 100644
--- a/drivers/gpu/drm/i915/i915_debugfs.c
+++ b/drivers/gpu/drm/i915/i915_debugfs.c
@@ -2873,6 +2873,20 @@  static void intel_dp_info(struct seq_file *m,
 		intel_panel_info(m, &intel_connector->panel);
 }
 
+static void intel_dp_mst_info(struct seq_file *m,
+			  struct intel_connector *intel_connector)
+{
+	struct intel_encoder *intel_encoder = intel_connector->encoder;
+	struct intel_dp_mst_encoder *intel_mst =
+		enc_to_mst(&intel_encoder->base);
+	struct intel_digital_port *intel_dig_port = intel_mst->primary;
+	struct intel_dp *intel_dp = &intel_dig_port->dp;
+	bool has_audio = drm_dp_mst_port_has_audio(&intel_dp->mst_mgr,
+					intel_connector->port);
+
+	seq_printf(m, "\taudio support: %s\n", yesno(has_audio));
+}
+
 static void intel_hdmi_info(struct seq_file *m,
 			    struct intel_connector *intel_connector)
 {
@@ -2916,6 +2930,8 @@  static void intel_connector_info(struct seq_file *m,
 			intel_hdmi_info(m, intel_connector);
 		else if (intel_encoder->type == INTEL_OUTPUT_LVDS)
 			intel_lvds_info(m, intel_connector);
+		else if (intel_encoder->type == INTEL_OUTPUT_DP_MST)
+			intel_dp_mst_info(m, intel_connector);
 	}
 
 	seq_printf(m, "\tmodes:\n");
diff --git a/drivers/gpu/drm/i915/intel_audio.c b/drivers/gpu/drm/i915/intel_audio.c
index 63d4706..172c106 100644
--- a/drivers/gpu/drm/i915/intel_audio.c
+++ b/drivers/gpu/drm/i915/intel_audio.c
@@ -262,7 +262,8 @@  static void hsw_audio_codec_disable(struct intel_encoder *encoder)
 	tmp |= AUD_CONFIG_N_PROG_ENABLE;
 	tmp &= ~AUD_CONFIG_UPPER_N_MASK;
 	tmp &= ~AUD_CONFIG_LOWER_N_MASK;
-	if (intel_pipe_has_type(intel_crtc, INTEL_OUTPUT_DISPLAYPORT))
+	if (intel_pipe_has_type(intel_crtc, INTEL_OUTPUT_DISPLAYPORT) ||
+	    intel_pipe_has_type(intel_crtc, INTEL_OUTPUT_DP_MST))
 		tmp |= AUD_CONFIG_N_VALUE_INDEX;
 	I915_WRITE(HSW_AUD_CFG(pipe), tmp);
 
@@ -478,7 +479,8 @@  static void ilk_audio_codec_enable(struct drm_connector *connector,
 	tmp &= ~AUD_CONFIG_N_VALUE_INDEX;
 	tmp &= ~AUD_CONFIG_N_PROG_ENABLE;
 	tmp &= ~AUD_CONFIG_PIXEL_CLOCK_HDMI_MASK;
-	if (intel_pipe_has_type(intel_crtc, INTEL_OUTPUT_DISPLAYPORT))
+	if (intel_pipe_has_type(intel_crtc, INTEL_OUTPUT_DISPLAYPORT) ||
+	    intel_pipe_has_type(intel_crtc, INTEL_OUTPUT_DP_MST))
 		tmp |= AUD_CONFIG_N_VALUE_INDEX;
 	else
 		tmp |= audio_config_hdmi_pixel_clock(adjusted_mode);
@@ -516,7 +518,8 @@  void intel_audio_codec_enable(struct intel_encoder *intel_encoder)
 
 	/* ELD Conn_Type */
 	connector->eld[5] &= ~(3 << 2);
-	if (intel_pipe_has_type(crtc, INTEL_OUTPUT_DISPLAYPORT))
+	if (intel_pipe_has_type(crtc, INTEL_OUTPUT_DISPLAYPORT) ||
+	    intel_pipe_has_type(crtc, INTEL_OUTPUT_DP_MST))
 		connector->eld[5] |= (1 << 2);
 
 	connector->eld[6] = drm_av_sync_delay(connector, adjusted_mode) / 2;
diff --git a/drivers/gpu/drm/i915/intel_ddi.c b/drivers/gpu/drm/i915/intel_ddi.c
index 06d3002..640db49 100644
--- a/drivers/gpu/drm/i915/intel_ddi.c
+++ b/drivers/gpu/drm/i915/intel_ddi.c
@@ -3043,6 +3043,19 @@  void intel_ddi_fdi_disable(struct drm_crtc *crtc)
 	I915_WRITE(FDI_RX_CTL(PIPE_A), val);
 }
 
+void intel_set_pipe_has_audio(struct drm_i915_private *dev_priv,
+			  struct intel_crtc *intel_crtc,
+			  struct intel_crtc_state *pipe_config)
+{
+	u32 temp;
+
+	if (intel_display_power_is_enabled(dev_priv, POWER_DOMAIN_AUDIO)) {
+		temp = I915_READ(HSW_AUD_PIN_ELD_CP_VLD);
+		if (temp & AUDIO_OUTPUT_ENABLE(intel_crtc->pipe))
+			pipe_config->has_audio = true;
+	}
+}
+
 void intel_ddi_get_config(struct intel_encoder *encoder,
 			  struct intel_crtc_state *pipe_config)
 {
@@ -3103,11 +3116,7 @@  void intel_ddi_get_config(struct intel_encoder *encoder,
 		break;
 	}
 
-	if (intel_display_power_is_enabled(dev_priv, POWER_DOMAIN_AUDIO)) {
-		temp = I915_READ(HSW_AUD_PIN_ELD_CP_VLD);
-		if (temp & AUDIO_OUTPUT_ENABLE(intel_crtc->pipe))
-			pipe_config->has_audio = true;
-	}
+	intel_set_pipe_has_audio(dev_priv, intel_crtc, pipe_config);
 
 	if (encoder->type == INTEL_OUTPUT_EDP && dev_priv->vbt.edp_bpp &&
 	    pipe_config->pipe_bpp > dev_priv->vbt.edp_bpp) {
diff --git a/drivers/gpu/drm/i915/intel_dp_mst.c b/drivers/gpu/drm/i915/intel_dp_mst.c
index 0639275..625f831 100644
--- a/drivers/gpu/drm/i915/intel_dp_mst.c
+++ b/drivers/gpu/drm/i915/intel_dp_mst.c
@@ -78,6 +78,8 @@  static bool intel_dp_mst_compute_config(struct intel_encoder *encoder,
 		return false;
 	}
 
+	if (drm_dp_mst_port_has_audio(&intel_dp->mst_mgr, found->port))
+		pipe_config->has_audio = true;
 	mst_pbn = drm_dp_calc_pbn_mode(adjusted_mode->crtc_clock, bpp);
 
 	pipe_config->pbn = mst_pbn;
@@ -102,6 +104,11 @@  static void intel_mst_disable_dp(struct intel_encoder *encoder)
 	struct intel_dp_mst_encoder *intel_mst = enc_to_mst(&encoder->base);
 	struct intel_digital_port *intel_dig_port = intel_mst->primary;
 	struct intel_dp *intel_dp = &intel_dig_port->dp;
+	struct drm_device *dev = encoder->base.dev;
+	struct drm_i915_private *dev_priv = dev->dev_private;
+	struct drm_crtc *crtc = encoder->base.crtc;
+	struct intel_crtc *intel_crtc = to_intel_crtc(crtc);
+
 	int ret;
 
 	DRM_DEBUG_KMS("%d\n", intel_dp->active_mst_links);
@@ -112,6 +119,10 @@  static void intel_mst_disable_dp(struct intel_encoder *encoder)
 	if (ret) {
 		DRM_ERROR("failed to update payload %d\n", ret);
 	}
+	if (intel_crtc->config->has_audio) {
+		intel_audio_codec_disable(encoder);
+		intel_display_power_put(dev_priv, POWER_DOMAIN_AUDIO);
+	}
 }
 
 static void intel_mst_post_disable_dp(struct intel_encoder *encoder)
@@ -214,6 +225,7 @@  static void intel_mst_enable_dp(struct intel_encoder *encoder)
 	struct intel_dp *intel_dp = &intel_dig_port->dp;
 	struct drm_device *dev = intel_dig_port->base.base.dev;
 	struct drm_i915_private *dev_priv = dev->dev_private;
+	struct intel_crtc *crtc = to_intel_crtc(encoder->base.crtc);
 	enum port port = intel_dig_port->port;
 	int ret;
 
@@ -226,6 +238,13 @@  static void intel_mst_enable_dp(struct intel_encoder *encoder)
 	ret = drm_dp_check_act_status(&intel_dp->mst_mgr);
 
 	ret = drm_dp_update_payload_part2(&intel_dp->mst_mgr);
+
+	if (crtc->config->has_audio) {
+		DRM_DEBUG_DRIVER("Enabling DP audio on pipe %c\n",
+				 pipe_name(crtc->pipe));
+		intel_display_power_get(dev_priv, POWER_DOMAIN_AUDIO);
+		intel_audio_codec_enable(encoder);
+	}
 }
 
 static bool intel_dp_mst_enc_get_hw_state(struct intel_encoder *encoder,
@@ -251,6 +270,8 @@  static void intel_dp_mst_enc_get_config(struct intel_encoder *encoder,
 
 	pipe_config->has_dp_encoder = true;
 
+	intel_set_pipe_has_audio(dev_priv, crtc, pipe_config);
+
 	temp = I915_READ(TRANS_DDI_FUNC_CTL(cpu_transcoder));
 	if (temp & TRANS_DDI_PHSYNC)
 		flags |= DRM_MODE_FLAG_PHSYNC;
diff --git a/drivers/gpu/drm/i915/intel_drv.h b/drivers/gpu/drm/i915/intel_drv.h
index 92518b4..488d744 100644
--- a/drivers/gpu/drm/i915/intel_drv.h
+++ b/drivers/gpu/drm/i915/intel_drv.h
@@ -1013,6 +1013,9 @@  void intel_ddi_set_pipe_settings(struct drm_crtc *crtc);
 void intel_ddi_prepare_link_retrain(struct intel_dp *intel_dp);
 bool intel_ddi_connector_get_hw_state(struct intel_connector *intel_connector);
 void intel_ddi_fdi_disable(struct drm_crtc *crtc);
+void intel_set_pipe_has_audio(struct drm_i915_private *dev_priv,
+			  struct intel_crtc *intel_crtc,
+			  struct intel_crtc_state *pipe_config);
 void intel_ddi_get_config(struct intel_encoder *encoder,
 			  struct intel_crtc_state *pipe_config);
 struct intel_encoder *

Comments

On Wed, 2015-11-25 at 13:19 +0800, libin.yang@linux.intel.com wrote:
> From: Libin Yang <libin.yang@linux.intel.com>
> 
> This patch adds support for DP MST audio in i915.

The title says "start adding" so a note of what's still missing would be good
here. I assume something is missing since I tested these two patches, and while
I got a new sound device for my MST monitor, no audio came out of that.

With this and the change I asked below, this is 

Reviewed-by: Ander Conselvan de Oliveira <conselvan2@gmail.com>

> Enable audio codec when DP MST is enabled if has_audio flag is set.
> Disable audio codec when DP MST is disabled if has_audio flag is set.
> 
> Signed-off-by: Libin Yang <libin.yang@linux.intel.com>
> Signed-off-by: Dave Airlie <airlied@redhat.com>
> ---
>  drivers/gpu/drm/i915/i915_debugfs.c | 16 ++++++++++++++++
>  drivers/gpu/drm/i915/intel_audio.c  |  9 ++++++---
>  drivers/gpu/drm/i915/intel_ddi.c    | 19 ++++++++++++++-----
>  drivers/gpu/drm/i915/intel_dp_mst.c | 21 +++++++++++++++++++++
>  drivers/gpu/drm/i915/intel_drv.h    |  3 +++
>  5 files changed, 60 insertions(+), 8 deletions(-)
> 
> diff --git a/drivers/gpu/drm/i915/i915_debugfs.c
> b/drivers/gpu/drm/i915/i915_debugfs.c
> index 5659d4c..bc5a27e 100644
> --- a/drivers/gpu/drm/i915/i915_debugfs.c
> +++ b/drivers/gpu/drm/i915/i915_debugfs.c
> @@ -2873,6 +2873,20 @@ static void intel_dp_info(struct seq_file *m,
>  		intel_panel_info(m, &intel_connector->panel);
>  }
>  
> +static void intel_dp_mst_info(struct seq_file *m,
> +			  struct intel_connector *intel_connector)
> +{
> +	struct intel_encoder *intel_encoder = intel_connector->encoder;
> +	struct intel_dp_mst_encoder *intel_mst =
> +		enc_to_mst(&intel_encoder->base);
> +	struct intel_digital_port *intel_dig_port = intel_mst->primary;
> +	struct intel_dp *intel_dp = &intel_dig_port->dp;
> +	bool has_audio = drm_dp_mst_port_has_audio(&intel_dp->mst_mgr,
> +					intel_connector->port);
> +
> +	seq_printf(m, "\taudio support: %s\n", yesno(has_audio));
> +}
> +
>  static void intel_hdmi_info(struct seq_file *m,
>  			    struct intel_connector *intel_connector)
>  {
> @@ -2916,6 +2930,8 @@ static void intel_connector_info(struct seq_file *m,
>  			intel_hdmi_info(m, intel_connector);
>  		else if (intel_encoder->type == INTEL_OUTPUT_LVDS)
>  			intel_lvds_info(m, intel_connector);
> +		else if (intel_encoder->type == INTEL_OUTPUT_DP_MST)
> +			intel_dp_mst_info(m, intel_connector);
>  	}
>  
>  	seq_printf(m, "\tmodes:\n");
> diff --git a/drivers/gpu/drm/i915/intel_audio.c
> b/drivers/gpu/drm/i915/intel_audio.c
> index 63d4706..172c106 100644
> --- a/drivers/gpu/drm/i915/intel_audio.c
> +++ b/drivers/gpu/drm/i915/intel_audio.c
> @@ -262,7 +262,8 @@ static void hsw_audio_codec_disable(struct intel_encoder
> *encoder)
>  	tmp |= AUD_CONFIG_N_PROG_ENABLE;
>  	tmp &= ~AUD_CONFIG_UPPER_N_MASK;
>  	tmp &= ~AUD_CONFIG_LOWER_N_MASK;
> -	if (intel_pipe_has_type(intel_crtc, INTEL_OUTPUT_DISPLAYPORT))
> +	if (intel_pipe_has_type(intel_crtc, INTEL_OUTPUT_DISPLAYPORT) ||
> +	    intel_pipe_has_type(intel_crtc, INTEL_OUTPUT_DP_MST))
>  		tmp |= AUD_CONFIG_N_VALUE_INDEX;
>  	I915_WRITE(HSW_AUD_CFG(pipe), tmp);
>  
> @@ -478,7 +479,8 @@ static void ilk_audio_codec_enable(struct drm_connector
> *connector,
>  	tmp &= ~AUD_CONFIG_N_VALUE_INDEX;
>  	tmp &= ~AUD_CONFIG_N_PROG_ENABLE;
>  	tmp &= ~AUD_CONFIG_PIXEL_CLOCK_HDMI_MASK;
> -	if (intel_pipe_has_type(intel_crtc, INTEL_OUTPUT_DISPLAYPORT))
> +	if (intel_pipe_has_type(intel_crtc, INTEL_OUTPUT_DISPLAYPORT) ||
> +	    intel_pipe_has_type(intel_crtc, INTEL_OUTPUT_DP_MST))
>  		tmp |= AUD_CONFIG_N_VALUE_INDEX;
>  	else
>  		tmp |= audio_config_hdmi_pixel_clock(adjusted_mode);
> @@ -516,7 +518,8 @@ void intel_audio_codec_enable(struct intel_encoder
> *intel_encoder)
>  
>  	/* ELD Conn_Type */
>  	connector->eld[5] &= ~(3 << 2);
> -	if (intel_pipe_has_type(crtc, INTEL_OUTPUT_DISPLAYPORT))
> +	if (intel_pipe_has_type(crtc, INTEL_OUTPUT_DISPLAYPORT) ||
> +	    intel_pipe_has_type(crtc, INTEL_OUTPUT_DP_MST))
>  		connector->eld[5] |= (1 << 2);
>  
>  	connector->eld[6] = drm_av_sync_delay(connector, adjusted_mode) / 2;
> diff --git a/drivers/gpu/drm/i915/intel_ddi.c
> b/drivers/gpu/drm/i915/intel_ddi.c
> index 06d3002..640db49 100644
> --- a/drivers/gpu/drm/i915/intel_ddi.c
> +++ b/drivers/gpu/drm/i915/intel_ddi.c
> @@ -3043,6 +3043,19 @@ void intel_ddi_fdi_disable(struct drm_crtc *crtc)
>  	I915_WRITE(FDI_RX_CTL(PIPE_A), val);
>  }
>  
> +void intel_set_pipe_has_audio(struct drm_i915_private *dev_priv,

This is a DDI-specific function, so it should have an intel_ddi_ prefix. I think
it would also be good to make it return bool so it could have one less
parameter. The field in pipe_config can be set in the caller. I.e.

pipe_config->has_audio = intel_ddi_is_audio_enabled(crtc);

If you take dev_priv from the crtc it could have just one parameter.



> +			  struct intel_crtc *intel_crtc,
> +			  struct intel_crtc_state *pipe_config)
> +{
> +	u32 temp;
> +
> +	if (intel_display_power_is_enabled(dev_priv, POWER_DOMAIN_AUDIO)) {
> +		temp = I915_READ(HSW_AUD_PIN_ELD_CP_VLD);
> +		if (temp & AUDIO_OUTPUT_ENABLE(intel_crtc->pipe))
> +			pipe_config->has_audio = true;
> +	}
> +}
> +
>  void intel_ddi_get_config(struct intel_encoder *encoder,
>  			  struct intel_crtc_state *pipe_config)
>  {
> @@ -3103,11 +3116,7 @@ void intel_ddi_get_config(struct intel_encoder
> *encoder,
>  		break;
>  	}
>  
> -	if (intel_display_power_is_enabled(dev_priv, POWER_DOMAIN_AUDIO)) {
> -		temp = I915_READ(HSW_AUD_PIN_ELD_CP_VLD);
> -		if (temp & AUDIO_OUTPUT_ENABLE(intel_crtc->pipe))
> -			pipe_config->has_audio = true;
> -	}
> +	intel_set_pipe_has_audio(dev_priv, intel_crtc, pipe_config);
>  
>  	if (encoder->type == INTEL_OUTPUT_EDP && dev_priv->vbt.edp_bpp &&
>  	    pipe_config->pipe_bpp > dev_priv->vbt.edp_bpp) {
> diff --git a/drivers/gpu/drm/i915/intel_dp_mst.c
> b/drivers/gpu/drm/i915/intel_dp_mst.c
> index 0639275..625f831 100644
> --- a/drivers/gpu/drm/i915/intel_dp_mst.c
> +++ b/drivers/gpu/drm/i915/intel_dp_mst.c
> @@ -78,6 +78,8 @@ static bool intel_dp_mst_compute_config(struct intel_encoder
> *encoder,
>  		return false;
>  	}
>  
> +	if (drm_dp_mst_port_has_audio(&intel_dp->mst_mgr, found->port))
> +		pipe_config->has_audio = true;
>  	mst_pbn = drm_dp_calc_pbn_mode(adjusted_mode->crtc_clock, bpp);
>  
>  	pipe_config->pbn = mst_pbn;
> @@ -102,6 +104,11 @@ static void intel_mst_disable_dp(struct intel_encoder
> *encoder)
>  	struct intel_dp_mst_encoder *intel_mst = enc_to_mst(&encoder->base);
>  	struct intel_digital_port *intel_dig_port = intel_mst->primary;
>  	struct intel_dp *intel_dp = &intel_dig_port->dp;
> +	struct drm_device *dev = encoder->base.dev;
> +	struct drm_i915_private *dev_priv = dev->dev_private;
> +	struct drm_crtc *crtc = encoder->base.crtc;
> +	struct intel_crtc *intel_crtc = to_intel_crtc(crtc);
> +
>  	int ret;
>  
>  	DRM_DEBUG_KMS("%d\n", intel_dp->active_mst_links);
> @@ -112,6 +119,10 @@ static void intel_mst_disable_dp(struct intel_encoder
> *encoder)
>  	if (ret) {
>  		DRM_ERROR("failed to update payload %d\n", ret);
>  	}
> +	if (intel_crtc->config->has_audio) {
> +		intel_audio_codec_disable(encoder);
> +		intel_display_power_put(dev_priv, POWER_DOMAIN_AUDIO);
> +	}
>  }
>  
>  static void intel_mst_post_disable_dp(struct intel_encoder *encoder)
> @@ -214,6 +225,7 @@ static void intel_mst_enable_dp(struct intel_encoder
> *encoder)
>  	struct intel_dp *intel_dp = &intel_dig_port->dp;
>  	struct drm_device *dev = intel_dig_port->base.base.dev;
>  	struct drm_i915_private *dev_priv = dev->dev_private;
> +	struct intel_crtc *crtc = to_intel_crtc(encoder->base.crtc);
>  	enum port port = intel_dig_port->port;
>  	int ret;
>  
> @@ -226,6 +238,13 @@ static void intel_mst_enable_dp(struct intel_encoder
> *encoder)
>  	ret = drm_dp_check_act_status(&intel_dp->mst_mgr);
>  
>  	ret = drm_dp_update_payload_part2(&intel_dp->mst_mgr);
> +
> +	if (crtc->config->has_audio) {
> +		DRM_DEBUG_DRIVER("Enabling DP audio on pipe %c\n",
> +				 pipe_name(crtc->pipe));
> +		intel_display_power_get(dev_priv, POWER_DOMAIN_AUDIO);
> +		intel_audio_codec_enable(encoder);
> +	}
>  }
>  
>  static bool intel_dp_mst_enc_get_hw_state(struct intel_encoder *encoder,
> @@ -251,6 +270,8 @@ static void intel_dp_mst_enc_get_config(struct
> intel_encoder *encoder,
>  
>  	pipe_config->has_dp_encoder = true;
>  
> +	intel_set_pipe_has_audio(dev_priv, crtc, pipe_config);
> +
>  	temp = I915_READ(TRANS_DDI_FUNC_CTL(cpu_transcoder));
>  	if (temp & TRANS_DDI_PHSYNC)
>  		flags |= DRM_MODE_FLAG_PHSYNC;
> diff --git a/drivers/gpu/drm/i915/intel_drv.h
> b/drivers/gpu/drm/i915/intel_drv.h
> index 92518b4..488d744 100644
> --- a/drivers/gpu/drm/i915/intel_drv.h
> +++ b/drivers/gpu/drm/i915/intel_drv.h
> @@ -1013,6 +1013,9 @@ void intel_ddi_set_pipe_settings(struct drm_crtc *crtc);
>  void intel_ddi_prepare_link_retrain(struct intel_dp *intel_dp);
>  bool intel_ddi_connector_get_hw_state(struct intel_connector
> *intel_connector);
>  void intel_ddi_fdi_disable(struct drm_crtc *crtc);
> +void intel_set_pipe_has_audio(struct drm_i915_private *dev_priv,
> +			  struct intel_crtc *intel_crtc,
> +			  struct intel_crtc_state *pipe_config);
>  void intel_ddi_get_config(struct intel_encoder *encoder,
>  			  struct intel_crtc_state *pipe_config);
>  struct intel_encoder *
On 11/27/2015 08:29 PM, Ander Conselvan De Oliveira wrote:
> On Wed, 2015-11-25 at 13:19 +0800, libin.yang@linux.intel.com wrote:
>> From: Libin Yang <libin.yang@linux.intel.com>
>>
>> This patch adds support for DP MST audio in i915.
>
> The title says "start adding" so a note of what's still missing would be good
> here. I assume something is missing since I tested these two patches, and while
> I got a new sound device for my MST monitor, no audio came out of that.
>
> With this and the change I asked below, this is
>
> Reviewed-by: Ander Conselvan de Oliveira <conselvan2@gmail.com>
>
>> Enable audio codec when DP MST is enabled if has_audio flag is set.
>> Disable audio codec when DP MST is disabled if has_audio flag is set.
>>
>> Signed-off-by: Libin Yang <libin.yang@linux.intel.com>
>> Signed-off-by: Dave Airlie <airlied@redhat.com>
>> ---
>>   drivers/gpu/drm/i915/i915_debugfs.c | 16 ++++++++++++++++
>>   drivers/gpu/drm/i915/intel_audio.c  |  9 ++++++---
>>   drivers/gpu/drm/i915/intel_ddi.c    | 19 ++++++++++++++-----
>>   drivers/gpu/drm/i915/intel_dp_mst.c | 21 +++++++++++++++++++++
>>   drivers/gpu/drm/i915/intel_drv.h    |  3 +++
>>   5 files changed, 60 insertions(+), 8 deletions(-)
>>
>> diff --git a/drivers/gpu/drm/i915/i915_debugfs.c
>> b/drivers/gpu/drm/i915/i915_debugfs.c
>> index 5659d4c..bc5a27e 100644
>> --- a/drivers/gpu/drm/i915/i915_debugfs.c
>> +++ b/drivers/gpu/drm/i915/i915_debugfs.c
>> @@ -2873,6 +2873,20 @@ static void intel_dp_info(struct seq_file *m,
>>   		intel_panel_info(m, &intel_connector->panel);
>>   }
>>
>> +static void intel_dp_mst_info(struct seq_file *m,
>> +			  struct intel_connector *intel_connector)
>> +{
>> +	struct intel_encoder *intel_encoder = intel_connector->encoder;
>> +	struct intel_dp_mst_encoder *intel_mst =
>> +		enc_to_mst(&intel_encoder->base);
>> +	struct intel_digital_port *intel_dig_port = intel_mst->primary;
>> +	struct intel_dp *intel_dp = &intel_dig_port->dp;
>> +	bool has_audio = drm_dp_mst_port_has_audio(&intel_dp->mst_mgr,
>> +					intel_connector->port);
>> +
>> +	seq_printf(m, "\taudio support: %s\n", yesno(has_audio));
>> +}
>> +
>>   static void intel_hdmi_info(struct seq_file *m,
>>   			    struct intel_connector *intel_connector)
>>   {
>> @@ -2916,6 +2930,8 @@ static void intel_connector_info(struct seq_file *m,
>>   			intel_hdmi_info(m, intel_connector);
>>   		else if (intel_encoder->type == INTEL_OUTPUT_LVDS)
>>   			intel_lvds_info(m, intel_connector);
>> +		else if (intel_encoder->type == INTEL_OUTPUT_DP_MST)
>> +			intel_dp_mst_info(m, intel_connector);
>>   	}
>>
>>   	seq_printf(m, "\tmodes:\n");
>> diff --git a/drivers/gpu/drm/i915/intel_audio.c
>> b/drivers/gpu/drm/i915/intel_audio.c
>> index 63d4706..172c106 100644
>> --- a/drivers/gpu/drm/i915/intel_audio.c
>> +++ b/drivers/gpu/drm/i915/intel_audio.c
>> @@ -262,7 +262,8 @@ static void hsw_audio_codec_disable(struct intel_encoder
>> *encoder)
>>   	tmp |= AUD_CONFIG_N_PROG_ENABLE;
>>   	tmp &= ~AUD_CONFIG_UPPER_N_MASK;
>>   	tmp &= ~AUD_CONFIG_LOWER_N_MASK;
>> -	if (intel_pipe_has_type(intel_crtc, INTEL_OUTPUT_DISPLAYPORT))
>> +	if (intel_pipe_has_type(intel_crtc, INTEL_OUTPUT_DISPLAYPORT) ||
>> +	    intel_pipe_has_type(intel_crtc, INTEL_OUTPUT_DP_MST))
>>   		tmp |= AUD_CONFIG_N_VALUE_INDEX;
>>   	I915_WRITE(HSW_AUD_CFG(pipe), tmp);
>>
>> @@ -478,7 +479,8 @@ static void ilk_audio_codec_enable(struct drm_connector
>> *connector,
>>   	tmp &= ~AUD_CONFIG_N_VALUE_INDEX;
>>   	tmp &= ~AUD_CONFIG_N_PROG_ENABLE;
>>   	tmp &= ~AUD_CONFIG_PIXEL_CLOCK_HDMI_MASK;
>> -	if (intel_pipe_has_type(intel_crtc, INTEL_OUTPUT_DISPLAYPORT))
>> +	if (intel_pipe_has_type(intel_crtc, INTEL_OUTPUT_DISPLAYPORT) ||
>> +	    intel_pipe_has_type(intel_crtc, INTEL_OUTPUT_DP_MST))
>>   		tmp |= AUD_CONFIG_N_VALUE_INDEX;
>>   	else
>>   		tmp |= audio_config_hdmi_pixel_clock(adjusted_mode);
>> @@ -516,7 +518,8 @@ void intel_audio_codec_enable(struct intel_encoder
>> *intel_encoder)
>>
>>   	/* ELD Conn_Type */
>>   	connector->eld[5] &= ~(3 << 2);
>> -	if (intel_pipe_has_type(crtc, INTEL_OUTPUT_DISPLAYPORT))
>> +	if (intel_pipe_has_type(crtc, INTEL_OUTPUT_DISPLAYPORT) ||
>> +	    intel_pipe_has_type(crtc, INTEL_OUTPUT_DP_MST))
>>   		connector->eld[5] |= (1 << 2);
>>
>>   	connector->eld[6] = drm_av_sync_delay(connector, adjusted_mode) / 2;
>> diff --git a/drivers/gpu/drm/i915/intel_ddi.c
>> b/drivers/gpu/drm/i915/intel_ddi.c
>> index 06d3002..640db49 100644
>> --- a/drivers/gpu/drm/i915/intel_ddi.c
>> +++ b/drivers/gpu/drm/i915/intel_ddi.c
>> @@ -3043,6 +3043,19 @@ void intel_ddi_fdi_disable(struct drm_crtc *crtc)
>>   	I915_WRITE(FDI_RX_CTL(PIPE_A), val);
>>   }
>>
>> +void intel_set_pipe_has_audio(struct drm_i915_private *dev_priv,
>
> This is a DDI-specific function, so it should have an intel_ddi_ prefix. I think
> it would also be good to make it return bool so it could have one less
> parameter. The field in pipe_config can be set in the caller. I.e.
>
> pipe_config->has_audio = intel_ddi_is_audio_enabled(crtc);

OK.

>
> If you take dev_priv from the crtc it could have just one parameter.

Thanks for review. I have sent the new patches based on your 
suggestion. And I still use the dev_priv as parameter, hoping this may 
be a little efficient without getting the dev_priv again in the new 
function.

Best Regards,
Libin

>
>
>
>> +			  struct intel_crtc *intel_crtc,
>> +			  struct intel_crtc_state *pipe_config)
>> +{
>> +	u32 temp;
>> +
>> +	if (intel_display_power_is_enabled(dev_priv, POWER_DOMAIN_AUDIO)) {
>> +		temp = I915_READ(HSW_AUD_PIN_ELD_CP_VLD);
>> +		if (temp & AUDIO_OUTPUT_ENABLE(intel_crtc->pipe))
>> +			pipe_config->has_audio = true;
>> +	}
>> +}
>> +
>>   void intel_ddi_get_config(struct intel_encoder *encoder,
>>   			  struct intel_crtc_state *pipe_config)
>>   {
>> @@ -3103,11 +3116,7 @@ void intel_ddi_get_config(struct intel_encoder
>> *encoder,
>>   		break;
>>   	}
>>
>> -	if (intel_display_power_is_enabled(dev_priv, POWER_DOMAIN_AUDIO)) {
>> -		temp = I915_READ(HSW_AUD_PIN_ELD_CP_VLD);
>> -		if (temp & AUDIO_OUTPUT_ENABLE(intel_crtc->pipe))
>> -			pipe_config->has_audio = true;
>> -	}
>> +	intel_set_pipe_has_audio(dev_priv, intel_crtc, pipe_config);
>>
>>   	if (encoder->type == INTEL_OUTPUT_EDP && dev_priv->vbt.edp_bpp &&
>>   	    pipe_config->pipe_bpp > dev_priv->vbt.edp_bpp) {
>> diff --git a/drivers/gpu/drm/i915/intel_dp_mst.c
>> b/drivers/gpu/drm/i915/intel_dp_mst.c
>> index 0639275..625f831 100644
>> --- a/drivers/gpu/drm/i915/intel_dp_mst.c
>> +++ b/drivers/gpu/drm/i915/intel_dp_mst.c
>> @@ -78,6 +78,8 @@ static bool intel_dp_mst_compute_config(struct intel_encoder
>> *encoder,
>>   		return false;
>>   	}
>>
>> +	if (drm_dp_mst_port_has_audio(&intel_dp->mst_mgr, found->port))
>> +		pipe_config->has_audio = true;
>>   	mst_pbn = drm_dp_calc_pbn_mode(adjusted_mode->crtc_clock, bpp);
>>
>>   	pipe_config->pbn = mst_pbn;
>> @@ -102,6 +104,11 @@ static void intel_mst_disable_dp(struct intel_encoder
>> *encoder)
>>   	struct intel_dp_mst_encoder *intel_mst = enc_to_mst(&encoder->base);
>>   	struct intel_digital_port *intel_dig_port = intel_mst->primary;
>>   	struct intel_dp *intel_dp = &intel_dig_port->dp;
>> +	struct drm_device *dev = encoder->base.dev;
>> +	struct drm_i915_private *dev_priv = dev->dev_private;
>> +	struct drm_crtc *crtc = encoder->base.crtc;
>> +	struct intel_crtc *intel_crtc = to_intel_crtc(crtc);
>> +
>>   	int ret;
>>
>>   	DRM_DEBUG_KMS("%d\n", intel_dp->active_mst_links);
>> @@ -112,6 +119,10 @@ static void intel_mst_disable_dp(struct intel_encoder
>> *encoder)
>>   	if (ret) {
>>   		DRM_ERROR("failed to update payload %d\n", ret);
>>   	}
>> +	if (intel_crtc->config->has_audio) {
>> +		intel_audio_codec_disable(encoder);
>> +		intel_display_power_put(dev_priv, POWER_DOMAIN_AUDIO);
>> +	}
>>   }
>>
>>   static void intel_mst_post_disable_dp(struct intel_encoder *encoder)
>> @@ -214,6 +225,7 @@ static void intel_mst_enable_dp(struct intel_encoder
>> *encoder)
>>   	struct intel_dp *intel_dp = &intel_dig_port->dp;
>>   	struct drm_device *dev = intel_dig_port->base.base.dev;
>>   	struct drm_i915_private *dev_priv = dev->dev_private;
>> +	struct intel_crtc *crtc = to_intel_crtc(encoder->base.crtc);
>>   	enum port port = intel_dig_port->port;
>>   	int ret;
>>
>> @@ -226,6 +238,13 @@ static void intel_mst_enable_dp(struct intel_encoder
>> *encoder)
>>   	ret = drm_dp_check_act_status(&intel_dp->mst_mgr);
>>
>>   	ret = drm_dp_update_payload_part2(&intel_dp->mst_mgr);
>> +
>> +	if (crtc->config->has_audio) {
>> +		DRM_DEBUG_DRIVER("Enabling DP audio on pipe %c\n",
>> +				 pipe_name(crtc->pipe));
>> +		intel_display_power_get(dev_priv, POWER_DOMAIN_AUDIO);
>> +		intel_audio_codec_enable(encoder);
>> +	}
>>   }
>>
>>   static bool intel_dp_mst_enc_get_hw_state(struct intel_encoder *encoder,
>> @@ -251,6 +270,8 @@ static void intel_dp_mst_enc_get_config(struct
>> intel_encoder *encoder,
>>
>>   	pipe_config->has_dp_encoder = true;
>>
>> +	intel_set_pipe_has_audio(dev_priv, crtc, pipe_config);
>> +
>>   	temp = I915_READ(TRANS_DDI_FUNC_CTL(cpu_transcoder));
>>   	if (temp & TRANS_DDI_PHSYNC)
>>   		flags |= DRM_MODE_FLAG_PHSYNC;
>> diff --git a/drivers/gpu/drm/i915/intel_drv.h
>> b/drivers/gpu/drm/i915/intel_drv.h
>> index 92518b4..488d744 100644
>> --- a/drivers/gpu/drm/i915/intel_drv.h
>> +++ b/drivers/gpu/drm/i915/intel_drv.h
>> @@ -1013,6 +1013,9 @@ void intel_ddi_set_pipe_settings(struct drm_crtc *crtc);
>>   void intel_ddi_prepare_link_retrain(struct intel_dp *intel_dp);
>>   bool intel_ddi_connector_get_hw_state(struct intel_connector
>> *intel_connector);
>>   void intel_ddi_fdi_disable(struct drm_crtc *crtc);
>> +void intel_set_pipe_has_audio(struct drm_i915_private *dev_priv,
>> +			  struct intel_crtc *intel_crtc,
>> +			  struct intel_crtc_state *pipe_config);
>>   void intel_ddi_get_config(struct intel_encoder *encoder,
>>   			  struct intel_crtc_state *pipe_config);
>>   struct intel_encoder *