Re: [PATCH V4 2/2] drm/i915: start adding dp mst audio

[Libin Yang <libin.yang@linux.intel.com>]

Add Takashi and ALSA mail list.

On 12/10/2015 05:02 PM, Daniel Vetter wrote:
> On Tue, Dec 08, 2015 at 04:01:20PM +0800, Libin Yang wrote:
>> Hi all,
>>
>> Any comments on the patches?
>
> Sorry, simply fell through the cracks since Ander is on vacation. Takashi
> is working on some cleanup patches to have a port->encoder mapping for the
> audio side of i915. His patch cleans up all the existing audio code in
> i915, but please work together with him to align mst code with the new
> style.
>
> Both patches queued for next.

Yes, I have seen Takashi's patches. I will check the patches.

Best Regards,
Libin

>
> Thanks, Daniel
>
>>
>> Best Regards,
>> Libin
>>
>> On 12/02/2015 02:09 PM, libin.yang@linux.intel.com wrote:
>>> 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.
>>>
>>> Another separated patches to support DP MST audio will be implemented
>>> in audio driver.
>>>
>>> Reviewed-by: Ander Conselvan de Oliveira <conselvan2@gmail.com>
>>> 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    | 20 +++++++++++++++-----
>>>   drivers/gpu/drm/i915/intel_dp_mst.c | 22 ++++++++++++++++++++++
>>>   drivers/gpu/drm/i915/intel_drv.h    |  2 ++
>>>   5 files changed, 61 insertions(+), 8 deletions(-)
>>>
>>> diff --git a/drivers/gpu/drm/i915/i915_debugfs.c b/drivers/gpu/drm/i915/i915_debugfs.c
>>> index bfd57fb..8387638 100644
>>> --- a/drivers/gpu/drm/i915/i915_debugfs.c
>>> +++ b/drivers/gpu/drm/i915/i915_debugfs.c
>>> @@ -2850,6 +2850,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)
>>>   {
>>> @@ -2893,6 +2907,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 9aa83e7..5ad2e66 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);
>>>
>>> @@ -474,7 +475,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);
>>> @@ -512,7 +514,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 76ce7c2..bc7fffb 100644
>>> --- a/drivers/gpu/drm/i915/intel_ddi.c
>>> +++ b/drivers/gpu/drm/i915/intel_ddi.c
>>> @@ -3108,6 +3108,19 @@ void intel_ddi_fdi_disable(struct drm_crtc *crtc)
>>>   	I915_WRITE(FDI_RX_CTL(PIPE_A), val);
>>>   }
>>>
>>> +bool intel_ddi_is_audio_enabled(struct drm_i915_private *dev_priv,
>>> +				 struct intel_crtc *intel_crtc)
>>> +{
>>> +	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))
>>> +			return true;
>>> +	}
>>> +	return false;
>>> +}
>>> +
>>>   void intel_ddi_get_config(struct intel_encoder *encoder,
>>>   			  struct intel_crtc_state *pipe_config)
>>>   {
>>> @@ -3168,11 +3181,8 @@ 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;
>>> -	}
>>> +	pipe_config->has_audio =
>>> +		intel_ddi_is_audio_enabled(dev_priv, intel_crtc);
>>>
>>>   	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 8c4e7df..8b608c2 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)
>>> @@ -208,6 +219,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;
>>>
>>> @@ -220,6 +232,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,
>>> @@ -245,6 +264,9 @@ static void intel_dp_mst_enc_get_config(struct intel_encoder *encoder,
>>>
>>>   	pipe_config->has_dp_encoder = true;
>>>
>>> +	pipe_config->has_audio =
>>> +		intel_ddi_is_audio_enabled(dev_priv, crtc);
>>> +
>>>   	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 1ffd8d5..0d2c59f 100644
>>> --- a/drivers/gpu/drm/i915/intel_drv.h
>>> +++ b/drivers/gpu/drm/i915/intel_drv.h
>>> @@ -1011,6 +1011,8 @@ 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);
>>> +bool intel_ddi_is_audio_enabled(struct drm_i915_private *dev_priv,
>>> +				 struct intel_crtc *intel_crtc);
>>>   void intel_ddi_get_config(struct intel_encoder *encoder,
>>>   			  struct intel_crtc_state *pipe_config);
>>>   struct intel_encoder *
>>>
>> _______________________________________________
>> Intel-gfx mailing list
>> Intel-gfx@lists.freedesktop.org
>> http://lists.freedesktop.org/mailman/listinfo/intel-gfx
>
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx