Thanks Lyude. I realized that after sending the patches, will fix that.
On Thu, 2016-08-04 at 19:42 -0400, Lyude wrote:
> This should be added after patch #3, since that's the one that fixes
> enc_to_mst(). Otherwise:
>
> Reviewed-by: Lyude <cpaul@xxxxxxxxxx>
>
> On Tue, 2016-08-02 at 18:46 -0700, Dhinakaran Pandiyan wrote:
> > From: Libin Yang <libin.yang@xxxxxxxxxxxxxxx>
> >
> > (This patch is developed by Dave Airlie <airlied@xxxxxxxxxx>
> > originally)
> >
> > 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.
> >
> > Signed-off-by: Libin Yang <libin.yang@xxxxxxxxxxxxxxx>
> > ---
> > drivers/gpu/drm/i915/i915_debugfs.c | 19 ++++++++++++++++++-
> > drivers/gpu/drm/i915/intel_ddi.c | 20 +++++++++++++++-----
> > drivers/gpu/drm/i915/intel_dp_mst.c | 21 +++++++++++++++++++++
> > drivers/gpu/drm/i915/intel_drv.h | 2 ++
> > 4 files changed, 56 insertions(+), 6 deletions(-)
> >
> > diff --git a/drivers/gpu/drm/i915/i915_debugfs.c
> > b/drivers/gpu/drm/i915/i915_debugfs.c
> > index 531ca02..56e38b1 100644
> > --- a/drivers/gpu/drm/i915/i915_debugfs.c
> > +++ b/drivers/gpu/drm/i915/i915_debugfs.c
> > @@ -2961,6 +2961,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)
> > {
> > @@ -3003,7 +3017,10 @@ static void intel_connector_info(struct
> > seq_file *m,
> > switch (connector->connector_type) {
> > case DRM_MODE_CONNECTOR_DisplayPort:
> > case DRM_MODE_CONNECTOR_eDP:
> > - intel_dp_info(m, intel_connector);
> > + if (intel_encoder->type == INTEL_OUTPUT_DP_MST)
> > + intel_dp_mst_info(m, intel_connector);
> > + else
> > + intel_dp_info(m, intel_connector);
> > break;
> > case DRM_MODE_CONNECTOR_LVDS:
> > if (intel_encoder->type == INTEL_OUTPUT_LVDS)
> > diff --git a/drivers/gpu/drm/i915/intel_ddi.c
> > b/drivers/gpu/drm/i915/intel_ddi.c
> > index dd1d6fe..cbb4e7a 100644
> > --- a/drivers/gpu/drm/i915/intel_ddi.c
> > +++ b/drivers/gpu/drm/i915/intel_ddi.c
> > @@ -2154,6 +2154,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)
> > {
> > @@ -2219,11 +2232,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 68a005d..84dbb50 100644
> > --- a/drivers/gpu/drm/i915/intel_dp_mst.c
> > +++ b/drivers/gpu/drm/i915/intel_dp_mst.c
> > @@ -76,6 +76,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;
> > @@ -97,6 +99,10 @@ 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);
> > @@ -107,6 +113,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)
> > @@ -207,7 +217,9 @@ 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 = to_i915(dev);
> > + struct intel_crtc *crtc = to_intel_crtc(encoder->base.crtc);
> > enum port port = intel_dig_port->port;
> > + enum pipe pipe = crtc->pipe;
> > int ret;
> >
> > DRM_DEBUG_KMS("%d\n", intel_dp->active_mst_links);
> > @@ -222,6 +234,12 @@ 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(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 +263,9 @@ static void intel_dp_mst_enc_get_config(struct
> > intel_encoder *encoder,
> > enum transcoder cpu_transcoder = pipe_config-
> > >cpu_transcoder;
> > u32 temp, flags = 0;
> >
> > + 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 e74d851..f73de63c 100644
> > --- a/drivers/gpu/drm/i915/intel_drv.h
> > +++ b/drivers/gpu/drm/i915/intel_drv.h
> > @@ -1123,6 +1123,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@xxxxxxxxxxxxxxxxxxxxx
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
