[Intel-gfx] [PATCH] Revert "drm/i915: start adding dp mst audio"
Jani Nikula
jani.nikula at intel.com
Fri Sep 30 06:39:15 UTC 2016
On Fri, 30 Sep 2016, "Pandiyan, Dhinakaran" <dhinakaran.pandiyan at intel.com> wrote:
> On Thu, 2016-09-29 at 11:39 +0300, Jani Nikula wrote:
>> On Thu, 29 Sep 2016, Jani Nikula <jani.nikula at intel.com> wrote:
>> > On Thu, 29 Sep 2016, Dhinakaran Pandiyan <dhinakaran.pandiyan at intel.com> wrote:
>> >> This reverts 'commit 3708d5e082c3 ("drm/i915: start adding dp mst audio")'
>> >> because it breaks MST multi-monitor setups on some platforms.
>> >>
>> >> Bug: https://bugs.freedesktop.org/show_bug.cgi?id=97907
>> >>
>> >> Signed-off-by: Dhinakaran Pandiyan <dhinakaran.pandiyan at intel.com>
>> >> Reported-by: Kim Lidström <kim at dxtr.im>
>> >> Cc: Libin Yang <libin.yang at linux.intel.com>
>> >> Cc: Lyude <cpaul at redhat.com>
>> >> Cc: Jani Nikula <jani.nikula at intel.com>
>> >
>> > Pushed to drm-intel-next-queued, thanks for the patch.
>>
>> Oh, I hope
>>
>> commit f931894194b9395313d1c34f95ceb8d91f49790d
>> Author: Pandiyan, Dhinakaran <dhinakaran.pandiyan at intel.com>
>> Date: Wed Sep 21 13:02:48 2016 -0700
>>
>> drm/i915/dp: DP audio API changes for MST
>>
>> doesn't have a (functional) dependency on the reverted commit?
>>
>> BR,
>> Jani.
>>
>>
>>
>
>
> No, it doesn't. The API patch adds an extra parameter to the functions
> already exposed to the audio drivers and should not depend on the
> reverted MST audio enabling patch.
Thanks for confirming,
Jani.
>
> -DK
>
>> >
>> > BR,
>> > Jani.
>> >
>> >
>> >> ---
>> >> 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, 6 insertions(+), 53 deletions(-)
>> >>
>> >> diff --git a/drivers/gpu/drm/i915/i915_debugfs.c b/drivers/gpu/drm/i915/i915_debugfs.c
>> >> index 1ba6795..4fb9d82 100644
>> >> --- a/drivers/gpu/drm/i915/i915_debugfs.c
>> >> +++ b/drivers/gpu/drm/i915/i915_debugfs.c
>> >> @@ -2879,20 +2879,6 @@ 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,10 +2921,7 @@ static void intel_connector_info(struct seq_file *m,
>> >> switch (connector->connector_type) {
>> >> case DRM_MODE_CONNECTOR_DisplayPort:
>> >> case DRM_MODE_CONNECTOR_eDP:
>> >> - if (intel_encoder->type == INTEL_OUTPUT_DP_MST)
>> >> - intel_dp_mst_info(m, intel_connector);
>> >> - else
>> >> - intel_dp_info(m, intel_connector);
>> >> + 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 07cba6c..35f0b7c 100644
>> >> --- a/drivers/gpu/drm/i915/intel_ddi.c
>> >> +++ b/drivers/gpu/drm/i915/intel_ddi.c
>> >> @@ -2227,19 +2227,6 @@ 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)
>> >> {
>> >> @@ -2305,8 +2292,11 @@ void intel_ddi_get_config(struct intel_encoder *encoder,
>> >> break;
>> >> }
>> >>
>> >> - pipe_config->has_audio =
>> >> - intel_ddi_is_audio_enabled(dev_priv, intel_crtc);
>> >> + 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;
>> >> + }
>> >>
>> >> 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 2fc9f81..3ffbd69 100644
>> >> --- a/drivers/gpu/drm/i915/intel_dp_mst.c
>> >> +++ b/drivers/gpu/drm/i915/intel_dp_mst.c
>> >> @@ -37,8 +37,6 @@ 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;
>> >> @@ -61,8 +59,6 @@ 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;
>> >> @@ -88,7 +84,6 @@ 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);
>> >> @@ -99,10 +94,6 @@ 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,
>> >> @@ -215,12 +206,6 @@ 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);
>> >> - }
>> >> }
>> >>
>> >> static bool intel_dp_mst_enc_get_hw_state(struct intel_encoder *encoder,
>> >> @@ -243,9 +228,6 @@ 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 c49a11e..30e3f49 100644
>> >> --- a/drivers/gpu/drm/i915/intel_drv.h
>> >> +++ b/drivers/gpu/drm/i915/intel_drv.h
>> >> @@ -1156,8 +1156,6 @@ 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 *
>>
>
--
Jani Nikula, Intel Open Source Technology Center
More information about the Intel-gfx
mailing list