drm/i915/debugfs: add dp mst info
Subsystems (2)
PATCH 1/3 drm/i915/debugfs: add dp mst info
From: Libin Yang <[email protected]>
Add the DP MST info dump in debugfs.
--- drivers/gpu/drm/i915/i915_debugfs.c | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-)
drivers/gpu/drm/i915/i915_debugfs.c +18 -1
@@ -2877,6 +2877,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) {
@@ -2919,7 +2933,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 )
Signature · 6 lines
2.7.4 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 2/3 drm/i915: abstract ddi being audio enabled
From: Libin Yang <[email protected]>
Prepare for using the same code for judging ddi being audio enabled. No functional changes.
--- drivers/gpu/drm/i915/intel_ddi.c | 20 +++++++++++++++----- drivers/gpu/drm/i915/intel_drv.h | 2 ++ 2 files changed, 17 insertions(+), 5 deletions(-)
drivers/gpu/drm/i915/intel_ddi.c +15 -5
@@ -1950,6 +1950,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) {
@@ -2015,11 +2028,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_drv.h +2 -0
@@ -1175,6 +1175,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
Re: [PATCH 2/3] drm/i915: abstract ddi being audio enabled
Quoted 9 lines · On Mon, 28 Nov 2016, [email protected] wrote:
From: Libin Yang <[email protected]>
Prepare for using the same code for judging ddi being audio enabled. No functional changes.
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]>
Same thing about Rodrigo's sob.
Quoted 56 lines
--- drivers/gpu/drm/i915/intel_ddi.c | 20 +++++++++++++++----- drivers/gpu/drm/i915/intel_drv.h | 2 ++ 2 files changed, 17 insertions(+), 5 deletions(-)drivers/gpu/drm/i915/intel_ddi.c +15
-5@@ -1950,6 +1950,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) {@@ -2015,11 +2028,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_drv.h +2
-0@@ -1175,6 +1175,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
PATCH 3/3 drm/i915: enable dp mst audio
In reply to [email protected]From: Libin Yang <[email protected]>
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.
This patch is ported from
commit 3708d5e082c3 ("drm/i915: start adding dp mst audio")
And because commit 3708d5e082c3 ("drm/i915: start adding dp mst audio") breaks MST multi-monitor setups on some platforms, the orignal patch is reverted by
commit be754b101f70 ("Revert "drm/i915: start adding dp mst audio"")
As the multi-monitor setups issue is fixed, let's port the patch and enable the dp mst audio.
--- drivers/gpu/drm/i915/intel_dp_mst.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+)
drivers/gpu/drm/i915/intel_dp_mst.c +16 -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;
@@ -58,6 +60,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;
@@ -83,6 +87,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);
@@ -93,6 +98,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,
@@ -205,6 +214,10 @@ 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) { +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,
@@ -227,6 +240,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 ;
Signature · 6 lines
2.7.4 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 3/3] drm/i915: enable dp mst audio
Quoted 18 lines · On Mon, 28 Nov 2016, [email protected] wrote:
From: Libin Yang <[email protected]>
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.
This patch is ported from
commit3708d5e082c3("drm/i915: start adding dp mst audio")And because commit
3708d5e082c3("drm/i915: start adding dp mst audio") breaks MST multi-monitor setups on some platforms, the orignal patch is reverted by
commitbe754b101f70("Revert "drm/i915: start adding dp mst audio"")
Quoted 8 lines
As the multi-monitor setups issue is fixed, let's port the patch and enable the dp mst audio.
Signed-off-by Libin Yang <[email protected]>Cc Lyude <[email protected]>Cc Jani Nikula <[email protected]>Cc Rodrigo Vivi <[email protected]>Cc Dhinakaran Pandiyan <[email protected]>
Looks nicer now.
Quoted 66 lines
--- drivers/gpu/drm/i915/intel_dp_mst.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+)drivers/gpu/drm/i915/intel_dp_mst.c +16
-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;@@ -58,6 +60,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;@@ -83,6 +87,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);@@ -93,6 +98,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,@@ -205,6 +214,10 @@ 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) { +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,@@ -227,6 +240,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 ;
Signature · 5 lines
Jani Nikula, Intel Open Source Technology Center _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✓ Fi.CI.BAT: success for series starting with [1/3] drm/i915/debugfs: add dp mst info
In reply to [email protected]== Series Details ==
== Series Details ==
Series: series starting with [1/3] drm/i915/debugfs: add dp mst info
URL : https://patchwork.freedesktop.org/series/16036/
State : success
== Summary ==
Series 16036v1 Series without cover letter
https://patchwork.freedesktop.org/api/1.0/series/16036/revisions/1/mbox/
fi-bdw-5557u total:245 pass:230 dwarn:0 dfail:0 fail:0 skip:15 fi-bsw-n3050 total:245 pass:205 dwarn:0 dfail:0 fail:0 skip:40 fi-byt-j1900 total:245 pass:217 dwarn:0 dfail:0 fail:0 skip:28 fi-byt-n2820 total:245 pass:213 dwarn:0 dfail:0 fail:0 skip:32 fi-hsw-4770 total:245 pass:225 dwarn:0 dfail:0 fail:0 skip:20 fi-hsw-4770r total:245 pass:225 dwarn:0 dfail:0 fail:0 skip:20 fi-ilk-650 total:245 pass:192 dwarn:0 dfail:0 fail:0 skip:53 fi-ivb-3520m total:245 pass:223 dwarn:0 dfail:0 fail:0 skip:22 fi-ivb-3770 total:245 pass:223 dwarn:0 dfail:0 fail:0 skip:22 fi-kbl-7500u total:245 pass:223 dwarn:0 dfail:0 fail:0 skip:22 fi-skl-6260u total:245 pass:231 dwarn:0 dfail:0 fail:0 skip:14 fi-skl-6700hq total:245 pass:224 dwarn:0 dfail:0 fail:0 skip:21 fi-skl-6700k total:245 pass:223 dwarn:1 dfail:0 fail:0 skip:21 fi-skl-6770hq total:245 pass:231 dwarn:0 dfail:0 fail:0 skip:14 fi-snb-2520m total:245 pass:213 dwarn:0 dfail:0 fail:0 skip:32 fi-snb-2600 total:245 pass:212 dwarn:0 dfail:0 fail:0 skip:33
8f02d2103390e48e9e76c9e75d16dbb4396484c8 drm-tip: 2016y-11m-28d-12h-38m-14s UTC integration manifest 398e091 drm/i915: enable dp mst audio
1ebd50a drm/i915: abstract ddi being audio enabled
059c25e drm/i915/debugfs: add dp mst info
== Logs ==
For more details see: https://intel-gfx-ci.01.org/CI/Patchwork_3125/
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 8 lines · On Mon, 28 Nov 2016, [email protected] wrote:
From: Libin Yang <[email protected]>
Add the DP MST info dump in debugfs.
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]>
I don't think Rodrigo's sob is proper here, even if he pushed the original version of the patch that got later reverted.
Anyway,
Quoted 41 lines
--- drivers/gpu/drm/i915/i915_debugfs.c | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-)drivers/gpu/drm/i915/i915_debugfs.c +18
-1@@ -2877,6 +2877,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) {@@ -2919,7 +2933,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 )
Signature · 5 lines
Jani Nikula, Intel Open Source Technology Center _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Jani Nikula
maintainerQuoted 5 lines · Jani Nikula
Quoted 4 lines · On Mon, 28 Nov 2016, [email protected] wrote:
From: Libin Yang <[email protected]>
Add the DP MST info dump in debugfs.
Quoted 7 lines
Quoted 4 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]>I don't think Rodrigo's sob is proper here, even if he pushed the original version of the patch that got later reverted.
Pushed the series, with the tags fixed a bit, thanks for the patches.
BR,
Jani.
Quoted 46 lines
Anyway,
Reviewed-by Jani Nikula <[email protected]>Quoted 41 lines
--- drivers/gpu/drm/i915/i915_debugfs.c | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-)drivers/gpu/drm/i915/i915_debugfs.c +18
-1@@ -2877,6 +2877,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) {@@ -2919,7 +2933,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 )
Signature · 5 lines
Jani Nikula, Intel Open Source Technology Center _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Vivi, Rodrigo
maintainerQuoted 5 lines · Jani Nikula
Quoted 4 lines · On Mon, 28 Nov 2016, [email protected] wrote:
From: Libin Yang <[email protected]>
Add the DP MST info dump in debugfs.
Quoted 7 lines
Quoted 4 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]>I don't think Rodrigo's sob is proper here, even if he pushed the original version of the patch that got later reverted.
Jani is right. I haven't signed this off.
I believe the idea was to CC me probably.
Quoted 38 lines
Anyway,
Reviewed-by Jani Nikula <[email protected]>Quoted 33 lines
--- drivers/gpu/drm/i915/i915_debugfs.c | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-)drivers/gpu/drm/i915/i915_debugfs.c +14
-0@@ -2877,6 +2877,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) {@@ -2919,7 +2933,10 @@ static void intel_connector_info(struct seq_file *m,switch (connector->connector_type) {case DRM_MODE_CONNECTOR_DisplayPort:case DRM_MODE_CONNECTOR_eDP:
Quoted 9 lines
drivers/gpu/drm/i915/i915_debugfs.c static void intel_connector_info(struct seq_file *m, · line 2942
Quoted 8 lines
drivers/gpu/drm/i915/i915_debugfs.c +4
-1-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 )
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 21 lines
-----Original Message-----
From: Vivi, Rodrigo
Sent: Wednesday, November 30, 2016 1:22 AM
To: [email protected]
Cc: [email protected]; [email protected]; Yang, Libin <[email protected]>; Vetter, Daniel <[email protected]>; [email protected]; Pandiyan, Dhinakaran <[email protected]>
Subject: Re: [PATCH 1/3] drm/i915/debugfs: add dp mst infoQuoted 10 lines · Jani Nikula
Quoted 8 lines · On Mon, 28 Nov 2016, [email protected] wrote:
From: Libin Yang <[email protected]>
Add the DP MST info dump in debugfs.
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]>
Quoted 5 lines
Quoted 2 lines
I don't think Rodrigo's sob is proper here, even if he pushed the original version of the patch that got later reverted.
Jani is right. I haven't signed this off.
I believe the idea was to CC me probably.
Get it. I will take care next time.
I added you because the original patch has your signed-off :)
Regards,
Libin
Quoted 19 lines
Quoted 19 lines
Anyway,
Reviewed-by Jani Nikula <[email protected]>Quoted 13 lines
--- drivers/gpu/drm/i915/i915_debugfs.c | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-)drivers/gpu/drm/i915/i915_debugfs.c +0
-0@@ -2877,6 +2877,20 @@ static void intel_dp_info(struct seq_file *m, &intel_dp->aux); }
Quoted 28 lines
Quoted 6 lines
Quoted 6 lines
drivers/gpu/drm/i915/i915_debugfs.c +6
-0+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;Quoted 8 lines
drivers/gpu/drm/i915/i915_debugfs.c static void intel_dp_info(struct seq_file *m,
Quoted 8 lines
drivers/gpu/drm/i915/i915_debugfs.c +6
-0+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) { @@ -2919,7
Quoted 13 lines
Quoted 12 lines
drivers/gpu/drm/i915/i915_debugfs.c +5
-1+2933,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 )
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx