drm/i915: start adding dp mst audio
Subsystems (2)
PATCH v3 1/1 drm/i915: start adding dp mst audio
From: Libin Yang <[email protected]>
(This patch is developed by Dave Airlie <[email protected]> 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.
v2:
Rebased.
v3:
refine to support updated intel_audio_codec_enable()
--- drivers/gpu/drm/i915/i915_debugfs.c | 19 ++++++++++++++++++- drivers/gpu/drm/i915/intel_ddi.c | 20 +++++++++++++++----- drivers/gpu/drm/i915/intel_dp_mst.c | 18 ++++++++++++++++++ drivers/gpu/drm/i915/intel_drv.h | 2 ++ 4 files changed, 53 insertions(+), 6 deletions(-)
drivers/gpu/drm/i915/i915_debugfs.c +18 -1
@@ -2893,6 +2893,20 @@ static void intel_dp_info(struct seq_file *m, &intel_dp->aux); } +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) {
@@ -2935,7 +2949,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 )
drivers/gpu/drm/i915/intel_ddi.c +15 -5
@@ -1951,6 +1951,19 @@ void intel_ddi_prepare_link_retrain(struct intel_dp *intel_dp)udelay (600 ); } +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) {
@@ -2016,11 +2029,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) {
drivers/gpu/drm/i915/intel_dp_mst.c +18 -0
@@ -37,6 +37,8 @@ static bool intel_dp_mst_compute_config(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 intel_connector *connector = +to_intel_connector (conn_state->connector);struct drm_atomic_state *state;int bpp;int lane_count, slots;
@@ -59,6 +61,8 @@ static bool intel_dp_mst_compute_config(struct intel_encoder *encoder, state = pipe_config->base.state; +if (drm_dp_mst_port_has_audio (&intel_dp->mst_mgr, connector->port)) + pipe_config->has_audio = true; mst_pbn =drm_dp_calc_pbn_mode (adjusted_mode->crtc_clock, bpp); pipe_config->pbn = mst_pbn;
@@ -84,6 +88,7 @@ static void intel_mst_disable_dp(struct intel_encoder *encoder,struct intel_dp *intel_dp = &intel_dig_port->dp;struct intel_connector *connector =to_intel_connector (old_conn_state->connector); +struct drm_i915_private *dev_priv =to_i915 (encoder->base.dev);int ret;DRM_DEBUG_KMS ("%d\n" , intel_dp->active_mst_links);
@@ -94,6 +99,10 @@ static void intel_mst_disable_dp(struct intel_encoder *encoder,if (ret) {DRM_ERROR ("failed to update payload %d\n" , ret); } +if (old_crtc_state->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,
@@ -206,6 +215,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 (pipe_config->has_audio) { +DRM_DEBUG_DRIVER ("Enabling DP audio on pipe %c\n" , +pipe_name (intel_mst->pipe)); +intel_display_power_get (dev_priv,POWER_DOMAIN_AUDIO ); +intel_audio_codec_enable (encoder, pipe_config, conn_state); + } } static bool intel_dp_mst_enc_get_hw_state(struct intel_encoder *encoder,
@@ -228,6 +243,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 ;
drivers/gpu/drm/i915/intel_drv.h +2 -0
@@ -1166,6 +1166,8 @@ bool intel_ddi_pll_select(struct intel_crtc *crtc,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); +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 *
Signature · 6 lines
2.7.4 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
As the dp-mst flicker issue has been fixed by Dhinakaran, let's resend this patch to gfx driver to support DP-MST audio.
This patch is also refined to support the new intel_audio_codec_enable() parameters.
Regards,
Libin
Quoted 205 lines
-----Original Message-----
From: Yang, Libin
Sent: Monday, November 14, 2016 1:32 PM
To: [email protected]; [email protected]; [email protected]; Vetter, Daniel <[email protected]>; [email protected]
Cc: Yang, Libin <[email protected]>; Libin Yang <[email protected]>; Pandiyan, Dhinakaran <[email protected]>; Vivi, Rodrigo <[email protected]>
Subject: [PATCH v3] drm/i915: start adding dp mst audioFrom: Libin Yang <[email protected]>
(This patch is developed by Dave Airlie <[email protected]> originally)
This patch adds support for DP MST audio in i915.
Enable audio codec when DP MST is enabled if
has_audioflag is set. Disable audio codec when DP MST is disabled ifhas_audioflag is set.Another separated patches to support DP MST audio will be implemented in audio driver.
v2:
Rebased.
v3:
refine to support updatedintel_audio_codec_enable()Signed-off-by Libin Yang <[email protected]>Signed-off-by Dhinakaran Pandiyan <[email protected]>Reviewed-by Lyude <[email protected]>Signed-off-by Rodrigo Vivi <[email protected]>--- drivers/gpu/drm/i915/i915_debugfs.c | 19 ++++++++++++++++++- drivers/gpu/drm/i915/intel_ddi.c | 20 +++++++++++++++----- drivers/gpu/drm/i915/intel_dp_mst.c | 18 ++++++++++++++++++ drivers/gpu/drm/i915/intel_drv.h | 2 ++ 4 files changed, 53 insertions(+), 6 deletions(-)drivers/gpu/drm/i915/i915_debugfs.c +16
-1@@ -2893,6 +2893,20 @@ static void intel_dp_info(struct seq_file *m, &intel_dp->aux); } +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) { @@ - 2935,7 +2949,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.cb/drivers/gpu/drm/i915/intel_ddi.cindex 0ad4e16..b1e3442 100644drivers/gpu/drm/i915/intel_ddi.c +13
-0@@ -1951,6 +1951,19 @@ void intel_ddi_prepare_link_retrain(struct intel_dp *intel_dp) udelay(600); } +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,drivers/gpu/drm/i915/intel_ddi.c +1
-1struct intel_crtc_state *pipe_config) { @@ -2016,11 +2029,8 @@ void intel_ddi_get_config(struct intel_encoder *encoder, break; } - if (intel_display_power_is_enabled(dev_priv,
POWER_DOMAIN_AUDIO)) {drivers/gpu/drm/i915/intel_ddi.c +2
-4- 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 --gita/drivers/gpu/drm/i915/intel_dp_mst.cb/drivers/gpu/drm/i915/intel_dp_mst.c
index 3ffbd69..96ff6a9 100644drivers/gpu/drm/i915/intel_dp_mst.c +2
-0@@ -37,6 +37,8 @@ static bool intel_dp_mst_compute_config(structintel_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 intel_connector *connector = +to_intel_connector (conn_state->connector);struct drm_atomic_state *state;drivers/gpu/drm/i915/intel_dp_mst.c +2
-0int bpp;int lane_count, slots;@@ -59,6 +61,8 @@ static bool intel_dp_mst_compute_config(structintel_encoder *encoder, state = pipe_config->base.state; +if (drm_dp_mst_port_has_audio (&intel_dp->mst_mgr, connector- >port)) + pipe_config->has_audio = true; mst_pbn = drm_dp_calc_pbn_mode(adjusted_mode->crtc_clock,bpp);
drivers/gpu/drm/i915/intel_dp_mst.c +1
-0pipe_config->pbn = mst_pbn;@@ -84,6 +88,7 @@ static void intel_mst_disable_dp(struct intel_encoder *encoder, struct intel_dp *intel_dp = &intel_dig_port->dp;struct intel_connector *connector =to_intel_connector (old_conn_state->connector); +struct drm_i915_private *dev_priv =to_i915 (encoder->base.dev);int ret;drivers/gpu/drm/i915/intel_dp_mst.c +4
-0DRM_DEBUG_KMS("%d\n", intel_dp->active_mst_links); @@ -94,6 +99,10 @@ static void intel_mst_disable_dp(struct intel_encoder *encoder, if (ret) {DRM_ERROR ("failed to update payload %d\n" , ret); } +if (old_crtc_state->has_audio) { +intel_audio_codec_disable (encoder); + intel_display_power_put(dev_priv,
POWER_DOMAIN_AUDIO);drivers/gpu/drm/i915/intel_dp_mst.c +1
-0+ } } static void intel_mst_post_disable_dp(struct intel_encoder *encoder, @@ -206,6 +215,12 @@ static void intel_mst_enable_dp(struct
intel_encoder*encoder,drivers/gpu/drm/i915/intel_dp_mst.c +4
-0ret =drm_dp_check_act_status (&intel_dp->mst_mgr); ret =drm_dp_update_payload_part2 (&intel_dp->mst_mgr); +if (pipe_config->has_audio) { +DRM_DEBUG_DRIVER ("Enabling DP audio on pipe %c\n" , +pipe_name (intel_mst->pipe)); + intel_display_power_get(dev_priv,
POWER_DOMAIN_AUDIO);drivers/gpu/drm/i915/intel_dp_mst.c +5
-0+intel_audio_codec_enable (encoder, pipe_config, conn_state); + } } static bool intel_dp_mst_enc_get_hw_state(struct intel_encoder *encoder,@@ -228,6 +243,9 @@ static void intel_dp_mst_enc_get_config(structintel_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 )drivers/gpu/drm/i915/intel_dp_mst.c +0
-0flags |=DRM_MODE_FLAG_PHSYNC ;drivers/gpu/drm/i915/intel_drv.h +0
-0@@ -1166,6 +1166,8 @@ bool intel_ddi_pll_select(struct intel_crtc *crtc,void
intel_ddi_set_pipe_settings(struct drm_crtc *crtc); voidintel_ddi_prepare_link_retrain(struct intel_dp *intel_dp); boolintel_ddi_connector_get_hw_state(struct intel_connector *intel_connector);drivers/gpu/drm/i915/intel_drv.h +2
-0+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
Quoted 3 lines
intel_encoder*
--
2.7.4
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Hi all,
Could anyone help review the patches? Thanks.
Regards,
Libin
Quoted 234 lines
-----Original Message-----
From: Intel-gfx [mailto:[email protected]] On Behalf Of Yang, Libin
Sent: Monday, November 14, 2016 1:41 PM
To: [email protected]; [email protected]; [email protected]; Vetter, Daniel <[email protected]>; [email protected]; Pandiyan, Dhinakaran <[email protected]>; Kp, Jeeja <[email protected]>
Cc: Libin Yang <[email protected]>; Pandiyan, Dhinakaran <[email protected]>; Vivi, Rodrigo <[email protected]>
Subject: Re: [Intel-gfx] [PATCH v3] drm/i915: start adding dp mst audioAs the dp-mst flicker issue has been fixed by Dhinakaran, let's resend this patch to gfx driver to support DP-MST audio.
This patch is also refined to support the new
intel_audio_codec_enable()parameters.Regards,
LibinQuoted 109 lines
-----Original Message-----
From: Yang, Libin
Sent: Monday, November 14, 2016 1:32 PM
To: [email protected]; [email protected]; [email protected]; Vetter, Daniel <[email protected]>; [email protected]
Cc: Yang, Libin <[email protected]>; Libin Yang <[email protected]>; Pandiyan, Dhinakaran <[email protected]>; Vivi, Rodrigo <[email protected]>
Subject: [PATCH v3] drm/i915: start adding dp mst audioFrom: Libin Yang <[email protected]>
(This patch is developed by Dave Airlie <[email protected]> originally)
This patch adds support for DP MST audio in i915.
Enable audio codec when DP MST is enabled if
has_audioflag is set. Disable audio codec when DP MST is disabled ifhas_audioflag is set.Another separated patches to support DP MST audio will be implemented in audio driver.
v2:
Rebased.
v3:
refine to support updatedintel_audio_codec_enable()Signed-off-by Libin Yang <[email protected]>Signed-off-by Dhinakaran Pandiyan <[email protected]>Reviewed-by Lyude <[email protected]>Signed-off-by Rodrigo Vivi <[email protected]>--- drivers/gpu/drm/i915/i915_debugfs.c | 19 ++++++++++++++++++- drivers/gpu/drm/i915/intel_ddi.c | 20 +++++++++++++++----- drivers/gpu/drm/i915/intel_dp_mst.c | 18 ++++++++++++++++++ drivers/gpu/drm/i915/intel_drv.h | 2 ++ 4 files changed, 53 insertions(+), 6 deletions(-)drivers/gpu/drm/i915/i915_debugfs.c +16
-1@@ -2893,6 +2893,20 @@ static void intel_dp_info(struct seq_file *m, &intel_dp->aux); } +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) { @@ - 2935,7 +2949,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.cb/drivers/gpu/drm/i915/intel_ddi.cindex 0ad4e16..b1e3442 100644drivers/gpu/drm/i915/intel_ddi.c +13
-0@@ -1951,6 +1951,19 @@ void intel_ddi_prepare_link_retrain(struct intel_dp *intel_dp) udelay(600); } +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,drivers/gpu/drm/i915/intel_ddi.c +1
-1struct intel_crtc_state *pipe_config) { @@ -2016,11 +2029,8 @@ void intel_ddi_get_config(struct intel_encoder *encoder, break; } - if (intel_display_power_is_enabled(dev_priv,
POWER_DOMAIN_AUDIO)) {drivers/gpu/drm/i915/intel_ddi.c void intel_ddi_get_config(struct intel_encoder *encoder,
Quoted 8 lines
drivers/gpu/drm/i915/intel_ddi.c +2
-4- 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&&
Quoted 89 lines
pipe_config->pipe_bpp>dev_priv->vbt.edp.bpp) { diff --gita/drivers/gpu/drm/i915/intel_dp_mst.cb/drivers/gpu/drm/i915/intel_dp_mst.c
index 3ffbd69..96ff6a9 100644drivers/gpu/drm/i915/intel_dp_mst.c +2
-0@@ -37,6 +37,8 @@ static bool intel_dp_mst_compute_config(structintel_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 intel_connector *connector = +to_intel_connector (conn_state->connector);struct drm_atomic_state *state;drivers/gpu/drm/i915/intel_dp_mst.c +2
-0int bpp;int lane_count, slots;@@ -59,6 +61,8 @@ static bool intel_dp_mst_compute_config(structintel_encoder *encoder, state = pipe_config->base.state; +if (drm_dp_mst_port_has_audio (&intel_dp->mst_mgr, connector- >port)) + pipe_config->has_audio = true; mst_pbn = drm_dp_calc_pbn_mode(adjusted_mode->crtc_clock,bpp);
drivers/gpu/drm/i915/intel_dp_mst.c +1
-0pipe_config->pbn = mst_pbn;@@ -84,6 +88,7 @@ static void intel_mst_disable_dp(structintel_encoder *encoder, struct intel_dp *intel_dp = &intel_dig_port->dp;struct intel_connector *connector =to_intel_connector (old_conn_state->connector); +struct drm_i915_private *dev_priv =to_i915 (encoder->base.dev);int ret;drivers/gpu/drm/i915/intel_dp_mst.c +5
-0DRM_DEBUG_KMS("%d\n", intel_dp->active_mst_links); @@ -94,6 +99,10 @@ static void intel_mst_disable_dp(struct intel_encoder +*encoder, if (ret) {DRM_ERROR ("failed to update payload %d\n" , ret); } +if (old_crtc_state->has_audio) { +intel_audio_codec_disable (encoder); + intel_display_power_put(dev_priv,
POWER_DOMAIN_AUDIO);drivers/gpu/drm/i915/intel_dp_mst.c +1
-0+ } } static void intel_mst_post_disable_dp(struct intel_encoder *encoder,@@ -
206,6 +215,12 @@ static void intel_mst_enable_dp(structintel_encoder*encoder,drivers/gpu/drm/i915/intel_dp_mst.c +4
-0ret =drm_dp_check_act_status (&intel_dp->mst_mgr); ret =drm_dp_update_payload_part2 (&intel_dp->mst_mgr); +if (pipe_config->has_audio) { +DRM_DEBUG_DRIVER ("Enabling DP audio on pipe %c\n" , +pipe_name (intel_mst->pipe)); + intel_display_power_get(dev_priv,
POWER_DOMAIN_AUDIO);drivers/gpu/drm/i915/intel_dp_mst.c +2
-0+intel_audio_codec_enable (encoder, pipe_config, conn_state); + } } static bool intel_dp_mst_enc_get_hw_state(struct intel_encoder*encoder, @@ -228,6 +243,9 @@ static void
intel_dp_mst_enc_get_config(structintel_encoder*encoder,drivers/gpu/drm/i915/intel_dp_mst.c +3
-0enum 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 ;drivers/gpu/drm/i915/intel_drv.h +0
-0@@ -1166,6 +1166,8 @@ bool intel_ddi_pll_select(struct intel_crtc *crtc, void intel_ddi_set_pipe_settings(struct drm_crtc *crtc); void
intel_ddi_prepare_link_retrain(struct intel_dp *intel_dp); boolintel_ddi_connector_get_hw_state(struct intel_connector *intel_connector);drivers/gpu/drm/i915/intel_drv.h bool intel_ddi_pll_select(struct intel_crtc *crtc,
Quoted 4 lines
drivers/gpu/drm/i915/intel_drv.h +2
-0+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*
Quoted 7 lines
Quoted 2 lines
--
2.7.4_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✓ Fi.CI.BAT: success for drm/i915: start adding dp mst audio
In reply to [email protected]== Series Details ==
== Series Details ==
Series: drm/i915: start adding dp mst audio
URL : https://patchwork.freedesktop.org/series/15245/
State : success
== Summary ==
Series 15245v1 drm/i915: start adding dp mst audio
https://patchwork.freedesktop.org/api/1.0/series/15245/revisions/1/mbox/
fi-bdw-5557u total:244 pass:229 dwarn:0 dfail:0 fail:0 skip:15 fi-bsw-n3050 total:244 pass:204 dwarn:0 dfail:0 fail:0 skip:40 fi-bxt-t5700 total:244 pass:216 dwarn:0 dfail:0 fail:0 skip:28 fi-byt-j1900 total:244 pass:216 dwarn:0 dfail:0 fail:0 skip:28 fi-byt-n2820 total:244 pass:212 dwarn:0 dfail:0 fail:0 skip:32 fi-hsw-4770 total:244 pass:224 dwarn:0 dfail:0 fail:0 skip:20 fi-hsw-4770r total:244 pass:224 dwarn:0 dfail:0 fail:0 skip:20 fi-ilk-650 total:244 pass:191 dwarn:0 dfail:0 fail:0 skip:53 fi-ivb-3520m total:244 pass:222 dwarn:0 dfail:0 fail:0 skip:22 fi-ivb-3770 total:244 pass:222 dwarn:0 dfail:0 fail:0 skip:22 fi-skl-6260u total:244 pass:230 dwarn:0 dfail:0 fail:0 skip:14 fi-skl-6700hq total:244 pass:223 dwarn:0 dfail:0 fail:0 skip:21 fi-skl-6700k total:244 pass:222 dwarn:1 dfail:0 fail:0 skip:21 fi-snb-2520m total:244 pass:212 dwarn:0 dfail:0 fail:0 skip:32 fi-snb-2600 total:244 pass:211 dwarn:0 dfail:0 fail:0 skip:33
48ac4d084b5911d7c88a6b54175731d6a87f1769 drm-intel-nightly: 2016y-11m-13d-16h-50m-41s UTC integration manifest 46ec54b drm/i915: start adding dp mst audio
== Logs ==
For more details see: https://intel-gfx-ci.01.org/CI/Patchwork_2975/
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Jani Nikula
maintainerQuoted 9 lines · On Mon, 14 Nov 2016, [email protected] wrote:
From: Libin Yang <[email protected]>
(This patch is developed by Dave Airlie <[email protected]> originally)
This patch adds support for DP MST audio in i915.
Enable audio codec when DP MST is enabled if
has_audioflag is set. Disable audio codec when DP MST is disabled ifhas_audioflag is set.
Quoted 7 lines
Another separated patches to support DP MST audio will be implemented in audio driver.
v2:
Rebased.
v3:
refine to support updatedintel_audio_codec_enable()
I view this patch different from usual because this regressed and was reverted before. Please split this up to three patches:
1) Do intel_dp_mst_info() in i915_debugfs.c. The information printed looks at the sink, not pipe config, so this is not dependent on the rest.
2) Abstract intel_ddi_is_audio_enabled(). It's a nice clean non-functional change.
3) The rest. The last patch *must* reference the original commit and the revert:
3708d5e082c3 ("drm/i915: start adding dp mst audio") be754b101f70 ("Revert "drm/i915: start adding dp mst audio"")
Please rename the patch title to something like, "enable dp mst audio" to distinguish.
If the split had been done originally, we would only have reverted part 3, not all of it. Please do it now.
More comments inline.
Quoted 39 lines
Signed-off-by Libin Yang <[email protected]>Signed-off-by Dhinakaran Pandiyan <[email protected]>Reviewed-by Lyude <[email protected]>Signed-off-by Rodrigo Vivi <[email protected]>--- drivers/gpu/drm/i915/i915_debugfs.c | 19 ++++++++++++++++++- drivers/gpu/drm/i915/intel_ddi.c | 20 +++++++++++++++----- drivers/gpu/drm/i915/intel_dp_mst.c | 18 ++++++++++++++++++ drivers/gpu/drm/i915/intel_drv.h | 2 ++ 4 files changed, 53 insertions(+), 6 deletions(-)drivers/gpu/drm/i915/i915_debugfs.c +14
-0@@ -2893,6 +2893,20 @@ static void intel_dp_info(struct seq_file *m, &intel_dp->aux); } +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) {
drivers/gpu/drm/i915/i915_debugfs.c static void intel_connector_info(struct seq_file *m, · line 2955
Quoted 8 lines
drivers/gpu/drm/i915/i915_debugfs.c +4
-1@@ -2935,7 +2949,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);
The above two hunks make up patch 1/3.
Quoted 28 lines
drivers/gpu/drm/i915/i915_debugfs.c +0
-0break ;case DRM_MODE_CONNECTOR_LVDS :if (intel_encoder->type ==INTEL_OUTPUT_LVDS )drivers/gpu/drm/i915/intel_ddi.c +13
-0@@ -1951,6 +1951,19 @@ void intel_ddi_prepare_link_retrain(struct intel_dp *intel_dp)udelay (600 ); } +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) {
drivers/gpu/drm/i915/intel_ddi.c void intel_ddi_get_config(struct intel_encoder *encoder, · line 2033
Quoted 10 lines
drivers/gpu/drm/i915/intel_ddi.c +2
-5@@ -2016,11 +2029,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);
The above two hunks + declaration in intel_drv.h make up patch 2/3.
Quoted 45 lines
drivers/gpu/drm/i915/intel_ddi.c +0
-0if (encoder->type ==INTEL_OUTPUT_EDP && dev_priv->vbt.edp.bpp && pipe_config->pipe_bpp > dev_priv->vbt.edp.bpp) {drivers/gpu/drm/i915/intel_dp_mst.c +9
-0@@ -37,6 +37,8 @@ static bool intel_dp_mst_compute_config(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 intel_connector *connector = +to_intel_connector (conn_state->connector);struct drm_atomic_state *state;int bpp;int lane_count, slots;@@ -59,6 +61,8 @@ static bool intel_dp_mst_compute_config(struct intel_encoder *encoder, state = pipe_config->base.state; +if (drm_dp_mst_port_has_audio (&intel_dp->mst_mgr, connector->port)) + pipe_config->has_audio = true; mst_pbn =drm_dp_calc_pbn_mode (adjusted_mode->crtc_clock, bpp); pipe_config->pbn = mst_pbn;@@ -84,6 +88,7 @@ static void intel_mst_disable_dp(struct intel_encoder *encoder,struct intel_dp *intel_dp = &intel_dig_port->dp;struct intel_connector *connector =to_intel_connector (old_conn_state->connector); +struct drm_i915_private *dev_priv =to_i915 (encoder->base.dev);int ret;DRM_DEBUG_KMS ("%d\n" , intel_dp->active_mst_links);@@ -94,6 +99,10 @@ static void intel_mst_disable_dp(struct intel_encoder *encoder,if (ret) {DRM_ERROR ("failed to update payload %d\n" , ret); } +if (old_crtc_state->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,
drivers/gpu/drm/i915/intel_dp_mst.c static void intel_mst_enable_dp(struct intel_encoder *encoder, · line 220
Quoted 6 lines
drivers/gpu/drm/i915/intel_dp_mst.c +3
-0@@ -206,6 +215,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 (pipe_config->has_audio) { +DRM_DEBUG_DRIVER ("Enabling DP audio on pipe %c\n" , +pipe_name (intel_mst->pipe));
Not thrilled about the debug logging here. Is the information in intel_audio_codec_enable() not enough? Can that be amended instead?
BR,
Jani.
Quoted 29 lines
drivers/gpu/drm/i915/intel_dp_mst.c +6
-0+intel_display_power_get (dev_priv,POWER_DOMAIN_AUDIO ); +intel_audio_codec_enable (encoder, pipe_config, conn_state); + } } static bool intel_dp_mst_enc_get_hw_state(struct intel_encoder *encoder,@@ -228,6 +243,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 ;drivers/gpu/drm/i915/intel_drv.h +2
-0@@ -1166,6 +1166,8 @@ bool intel_ddi_pll_select(struct intel_crtc *crtc,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); +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 *
Signature · 5 lines
Jani Nikula, Intel Open Source Technology Center _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Hi Jani,
Thanks for review. I will split this patch.
Regards,
Libin
Quoted 252 lines
-----Original Message-----
From: Jani Nikula [mailto:[email protected]]
Sent: Friday, November 25, 2016 10:23 PM
To: Yang, Libin <[email protected]>; [email protected]; [email protected]; Vetter, Daniel <[email protected]>; [email protected]
Cc: Yang, Libin <[email protected]>; Libin Yang <[email protected]>; Pandiyan, Dhinakaran <[email protected]>; Vivi, Rodrigo <[email protected]>
Subject: Re: [PATCH v3] drm/i915: start adding dp mst audioQuoted 10 lines · On Mon, 14 Nov 2016, [email protected] wrote:
From: Libin Yang <[email protected]>
(This patch is developed by Dave Airlie <[email protected]> originally)
This patch adds support for DP MST audio in i915.
Enable audio codec when DP MST is enabled if
has_audioflag is set. Disable audio codec when DP MST is disabled ifhas_audioflag is set.Quoted 7 lines
Another separated patches to support DP MST audio will be implemented in audio driver.
v2:
Rebased.
v3:
refine to support updatedintel_audio_codec_enable()I view this patch different from usual because this regressed and was reverted before. Please split this up to three patches:
1) Do
intel_dp_mst_info()ini915_debugfs.c. The information printed looks at the sink, not pipe config, so this is not dependent on the rest.2) Abstract
intel_ddi_is_audio_enabled(). It's a nice clean non-functional change.3) The rest. The last patch *must* reference the original commit and the revert:
3708d5e082c3("drm/i915: start adding dp mst audio")be754b101f70("Revert "drm/i915: start adding dp mst audio"")Please rename the patch title to something like, "enable dp mst audio" to distinguish.
If the split had been done originally, we would only have reverted part 3, not all of it. Please do it now.
More comments inline.
Quoted 28 lines
Signed-off-by Libin Yang <[email protected]>Signed-off-by Dhinakaran Pandiyan <[email protected]>Reviewed-by Lyude <[email protected]>Signed-off-by Rodrigo Vivi <[email protected]>Link:
http://patchwork.freedesktop.org/patch/msgid/1474334681-22690-6-git-se
[email protected]--- drivers/gpu/drm/i915/i915_debugfs.c | 19 ++++++++++++++++++- drivers/gpu/drm/i915/intel_ddi.c | 20 +++++++++++++++----- drivers/gpu/drm/i915/intel_dp_mst.c | 18 ++++++++++++++++++ drivers/gpu/drm/i915/intel_drv.h | 2 ++ 4 files changed, 53 insertions(+), 6 deletions(-)drivers/gpu/drm/i915/i915_debugfs.c +4
-0@@ -2893,6 +2893,20 @@ static void intel_dp_info(struct seq_file *m, &intel_dp->aux); } +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 =drivers/gpu/drm/i915/i915_debugfs.c static void intel_dp_info(struct seq_file *m, · line 2909
Quoted 10 lines
drivers/gpu/drm/i915/i915_debugfs.c +8
-0+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) { @@ -2935,7
drivers/gpu/drm/i915/i915_debugfs.c static void intel_connector_info(struct seq_file *m, · line 2955
Quoted 9 lines
drivers/gpu/drm/i915/i915_debugfs.c +5
-1+2949,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);The above two hunks make up patch 1/3.
drivers/gpu/drm/i915/intel_ddi.c void intel_ddi_prepare_link_retrain(struct
Quoted 8 lines
drivers/gpu/drm/i915/i915_debugfs.c +0
-0break ;case DRM_MODE_CONNECTOR_LVDS : if (intel_encoder->type == INTEL_OUTPUT_LVDS) diff --git
a/drivers/gpu/drm/i915/intel_ddi.cb/drivers/gpu/drm/i915/intel_ddi.cindex 0ad4e16..b1e3442 100644drivers/gpu/drm/i915/intel_ddi.c +0
-0@@ -1951,6 +1951,19 @@ void intel_ddi_prepare_link_retrain(struct
intel_dp*intel_dp)drivers/gpu/drm/i915/intel_ddi.c void intel_ddi_prepare_link_retrain(struct intel_dp *intel_dp)
Quoted 9 lines
drivers/gpu/drm/i915/intel_ddi.c +6
-0udelay (600 ); } +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)) {drivers/gpu/drm/i915/intel_ddi.c void intel_ddi_prepare_link_retrain(struct intel_dp *intel_dp)
Quoted 9 lines
drivers/gpu/drm/i915/intel_ddi.c +7
-0+ 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) { @@ -2016,11+2029,8 @@
drivers/gpu/drm/i915/intel_ddi.c
Quoted 5 lines
drivers/gpu/drm/i915/intel_ddi.c +0
-0void intel_ddi_get_config(struct intel_encoder *encoder,drivers/gpu/drm/i915/intel_ddi.c +0
-1break ; } - if (intel_display_power_is_enabled(dev_priv,
POWER_DOMAIN_AUDIO)) {drivers/gpu/drm/i915/intel_ddi.c void intel_ddi_get_config(struct intel_encoder *encoder, · line 2033
Quoted 6 lines
drivers/gpu/drm/i915/intel_ddi.c +2
-4- 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);The above two hunks + declaration in
intel_drv.hmake up patch 2/3.Quoted 2 lines
if (
encoder->type==INTEL_OUTPUT_EDP&&dev_priv->vbt.edp.bpp&&
drivers/gpu/drm/i915/intel_dp_mst.c static bool intel_dp_mst_compute_config(struct
Quoted 7 lines
pipe_config->pipe_bpp>dev_priv->vbt.edp.bpp) { diff --gita/drivers/gpu/drm/i915/intel_dp_mst.cb/drivers/gpu/drm/i915/intel_dp_mst.c
index 3ffbd69..96ff6a9 100644drivers/gpu/drm/i915/intel_dp_mst.c +0
-0@@ -37,6 +37,8 @@ static bool intel_dp_mst_compute_config(struct
intel_encoder*encoder,Quoted 10 lines
drivers/gpu/drm/i915/intel_dp_mst.c +2
-0struct 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 intel_connector *connector = +to_intel_connector (conn_state->connector);struct drm_atomic_state *state;int bpp;drivers/gpu/drm/i915/intel_dp_mst.c +0
-0int lane_count, slots;drivers/gpu/drm/i915/intel_dp_mst.c static bool intel_dp_mst_compute_config(struct · line 68
Quoted 8 lines
drivers/gpu/drm/i915/intel_dp_mst.c +2
-0@@ -59,6 +61,8 @@ static bool intel_dp_mst_compute_config(structintel_encoder *encoder, state = pipe_config->base.state; +if (drm_dp_mst_port_has_audio (&intel_dp->mst_mgr, connector- port)) + pipe_config->has_audio = true; mst_pbn = drm_dp_calc_pbn_mode(adjusted_mode->crtc_clock,bpp);
drivers/gpu/drm/i915/intel_dp_mst.c static void intel_mst_disable_dp(struct intel_encoder
Quoted 3 lines
drivers/gpu/drm/i915/intel_dp_mst.c +0
-0pipe_config->pbn = mst_pbn;@@ -84,6 +88,7 @@ static void intel_mst_disable_dp(struct intel_encoder*encoder,
drivers/gpu/drm/i915/intel_dp_mst.c static void intel_mst_disable_dp(struct intel_encoder *encoder,
Quoted 7 lines
drivers/gpu/drm/i915/intel_dp_mst.c +1
-0struct intel_dp *intel_dp = &intel_dig_port->dp;struct intel_connector *connector =to_intel_connector (old_conn_state->connector); +struct drm_i915_private *dev_priv =to_i915 (encoder->base.dev);int ret; DRM_DEBUG_KMS("%d\n", intel_dp->active_mst_links); @@ -94,6+99,10
drivers/gpu/drm/i915/intel_dp_mst.c static void intel_mst_disable_dp(struct intel_encoder *encoder,
Quoted 7 lines
@@ static void intel_mst_disable_dp(struct
intel_encoder*encoder,drivers/gpu/drm/i915/intel_dp_mst.c +3
-0if (ret) {DRM_ERROR ("failed to update payload %d\n" , ret); } +if (old_crtc_state->has_audio) { +intel_audio_codec_disable (encoder); + intel_display_power_put(dev_priv,
POWER_DOMAIN_AUDIO);drivers/gpu/drm/i915/intel_dp_mst.c static void intel_mst_enable_dp(struct
Quoted 5 lines
drivers/gpu/drm/i915/intel_dp_mst.c +1
-0+ } } static void intel_mst_post_disable_dp(struct intel_encoder *encoder,@@ -206,6 +215,12 @@ static void intel_mst_enable_dp(struct
intel_encoder*encoder,drivers/gpu/drm/i915/intel_dp_mst.c static void intel_mst_enable_dp(struct intel_encoder *encoder, · line 220
Quoted 6 lines
drivers/gpu/drm/i915/intel_dp_mst.c +3
-0ret =drm_dp_check_act_status (&intel_dp->mst_mgr); ret =drm_dp_update_payload_part2 (&intel_dp->mst_mgr); +if (pipe_config->has_audio) { +DRM_DEBUG_DRIVER ("Enabling DP audio on pipe %c\n" , +pipe_name (intel_mst->pipe));Not thrilled about the debug logging here. Is the information in
intel_audio_codec_enable()not enough? Can that be amended instead?BR,
Jani.drivers/gpu/drm/i915/intel_dp_mst.c static void intel_mst_enable_dp(struct · line 221
Quoted 1 line
drivers/gpu/drm/i915/intel_dp_mst.c +1
-0+ intel_display_power_get(dev_priv,
POWER_DOMAIN_AUDIO);Quoted 6 lines
drivers/gpu/drm/i915/intel_dp_mst.c +2
-0+intel_audio_codec_enable (encoder, pipe_config, conn_state); + } } static bool intel_dp_mst_enc_get_hw_state(struct intel_encoder*encoder, @@ -228,6 +243,9 @@ static void
intel_dp_mst_enc_get_config(struct
intel_encoder*encoder,Quoted 19 lines
drivers/gpu/drm/i915/intel_dp_mst.c +3
-0enum 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 ;drivers/gpu/drm/i915/intel_drv.h +0
-0@@ -1166,6 +1166,8 @@ bool intel_ddi_pll_select(struct intel_crtc *crtc, void intel_ddi_set_pipe_settings(struct drm_crtc *crtc); void
intel_ddi_prepare_link_retrain(struct intel_dp *intel_dp); boolintel_ddi_connector_get_hw_state(struct intel_connector *intel_connector);drivers/gpu/drm/i915/intel_drv.h bool intel_ddi_pll_select(struct intel_crtc *crtc,
Quoted 4 lines
drivers/gpu/drm/i915/intel_drv.h +2
-0+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*
Quoted 2 lines
--
Jani Nikula, Intel Open Source Technology Center
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx