Prep. for DP audio MST support
Subsystems (2)
v7 cover Prep. for DP audio MST support
This series lays the groundwork for more DP MST audio work that will follow.
v7:
Added R-B tags and rebased.
v6:
Modified the return type for a helper that returns port in intel_dvo.c
v5:
Really renamed the port enum member from 'attached_port' to 'port' Rebased on atomic changes.
v4:
Fixed missing port initialization in intel_sdvo.c Renamed the port enum member from 'attached_port' to 'port' Fixed commit message typos.
v3:
Different solution to get port from encoder (danvet). Removed locals that are not needed any more.
Minor variable renaming clean up.
Rebased on dinq.
Retained r-b for "start adding dp mst audio" as it does not change.
v2:
Different solution replacing the enc_to_dig_port() fix (Ville, Lyude). No changes to MST audio enabling and move audio_connector patches. Reordered the patches (Lyude)
Pandiyan, Dhinakaran (4):
drm/i915: Standardize port type for DVO encoders drm/i915: Store port enum in intel_encoder drm/i915: Switch to using port stored in intel_encoder drm/i915: Move audio_connector to intel_encoder
Libin Yang (1):
drm/i915: start adding dp mst audio
drivers/gpu/drm/i915/i915_debugfs.c | 19 +++++++++++++++- drivers/gpu/drm/i915/i915_drv.h | 1 + drivers/gpu/drm/i915/intel_audio.c | 44 +++++++++++++++---------------------- drivers/gpu/drm/i915/intel_crt.c | 2 ++ drivers/gpu/drm/i915/intel_ddi.c | 21 +++++++++++++----- drivers/gpu/drm/i915/intel_dp.c | 1 + drivers/gpu/drm/i915/intel_dp_mst.c | 19 ++++++++++++++++ drivers/gpu/drm/i915/intel_drv.h | 7 ++++-- drivers/gpu/drm/i915/intel_dsi.c | 1 + drivers/gpu/drm/i915/intel_dvo.c | 16 ++++++++------ drivers/gpu/drm/i915/intel_hdmi.c | 1 + drivers/gpu/drm/i915/intel_lvds.c | 3 ++- drivers/gpu/drm/i915/intel_sdvo.c | 1 + drivers/gpu/drm/i915/intel_tv.c | 2 ++ 14 files changed, 96 insertions(+), 42 deletions(-)
Signature · 6 lines
2.5.0 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v7 1/5 drm/i915: Standardize port type for DVO encoders
From: "Pandiyan, Dhinakaran" <[email protected]>
Changing the return type from 'char' to 'enum port' in intel_dvo_port_name() makes it easier to later move the port information to intel_encoder. In addition, the port type conforms to what we have elsewhere.
Removing the last conditional that handles invalid port because dvo_reg is intialized to valid values for all DVO devices at definition.
v2: Changed return type, for real (Jani)
--- drivers/gpu/drm/i915/intel_dvo.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-)
drivers/gpu/drm/i915/intel_dvo.c +7 -7
@@ -412,16 +412,14 @@ intel_dvo_get_current_mode(struct drm_connector *connector)return mode; } -static char intel_dvo_port_name (i915_reg_t dvo_reg) +static enum port intel_dvo_port (i915_reg_t dvo_reg) {if (i915_mmio_reg_equal (dvo_reg,DVOA )) -return 'A' ; +return PORT_A ;else if (i915_mmio_reg_equal (dvo_reg,DVOB )) -return 'B' ; -else if (i915_mmio_reg_equal (dvo_reg,DVOC )) -return 'C' ; +return PORT_B ;else -return '?' ; +return PORT_C ; }void intel_dvo_init (struct drm_device *dev)
@@ -464,6 +462,7 @@ void intel_dvo_init(struct drm_device *dev)bool dvoinit;enum pipe pipe;uint32_t dpll[I915_MAX_PIPES ]; +enum port port;/* Allow the I2C driver info to specify the GPIO to be used in * special cases, but otherwise default to what's defined
@@ -511,9 +510,10 @@ void intel_dvo_init(struct drm_device *dev)if (!dvoinit)continue ; + port =intel_dvo_port (dvo->dvo_reg);drm_encoder_init (dev, &intel_encoder->base, &intel_dvo_enc_funcs, encoder_type, -"DVO %c" ,intel_dvo_port_name (dvo->dvo_reg)); +"DVO %c" ,port_name (port)); intel_encoder->type =INTEL_OUTPUT_DVO ; intel_encoder->crtc_mask = (1 <<0 ) | (1 <<1 );
Signature · 6 lines
2.5.0 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v7 2/5 drm/i915: Store port enum in intel_encoder
In reply to Dhinakaran PandiyanFrom: "Pandiyan, Dhinakaran" <[email protected]>
Storing the port enum in intel_encoder makes it convenient to know the port attached to an encoder. Moving the port information up from intel_digital_port to intel_encoder avoids unecessary intel_digital_port access and handles MST encoders cleanly without requiring conditional checks for them (thanks danvet).
v2:
Renamed the port enum member from 'attached_port' to 'port' (danvet) Fixed missing initialization of port in intel_sdvo.c (danvet)
v3:
Fixed missing initialization of port in intel_crt.c (Ville)
v4:
Storing port for DVO encoders too.
--- drivers/gpu/drm/i915/i915_drv.h | 1 + drivers/gpu/drm/i915/intel_crt.c | 2 ++ drivers/gpu/drm/i915/intel_ddi.c | 1 + drivers/gpu/drm/i915/intel_dp.c | 1 + drivers/gpu/drm/i915/intel_dp_mst.c | 1 + drivers/gpu/drm/i915/intel_drv.h | 1 + drivers/gpu/drm/i915/intel_dsi.c | 1 + drivers/gpu/drm/i915/intel_dvo.c | 2 ++ drivers/gpu/drm/i915/intel_hdmi.c | 1 + drivers/gpu/drm/i915/intel_lvds.c | 3 ++- drivers/gpu/drm/i915/intel_sdvo.c | 1 + drivers/gpu/drm/i915/intel_tv.c | 2 ++ 12 files changed, 16 insertions(+), 1 deletion(-)
drivers/gpu/drm/i915/i915_drv.h +1 -0
@@ -185,6 +185,7 @@ enum plane {#define sprite_name (p, s) ((p) * INTEL_INFO(dev)->num_sprites[(p)] + (s) + 'A')enum port { +PORT_NONE =-1 ,PORT_A =0 ,PORT_B ,PORT_C ,
drivers/gpu/drm/i915/intel_crt.c +2 -0
@@ -917,10 +917,12 @@ void intel_crt_init(struct drm_device *dev)if (I915_HAS_HOTPLUG (dev)) crt->base.hpd_pin =HPD_CRT ;if (HAS_DDI (dev)) { + crt->base.port =PORT_E ; crt->base.get_config = hsw_crt_get_config; crt->base.get_hw_state = intel_ddi_get_hw_state; crt->base.post_disable = hsw_post_disable_crt; }else { + crt->base.port =PORT_NONE ; crt->base.get_config = intel_crt_get_config; crt->base.get_hw_state = intel_crt_get_hw_state; }
drivers/gpu/drm/i915/intel_ddi.c +1 -0
@@ -2523,6 +2523,7 @@ void intel_ddi_init(struct drm_device *dev, enum port port) intel_dig_port->max_lanes = max_lanes; intel_encoder->type =INTEL_OUTPUT_UNKNOWN ; + intel_encoder->port = port; intel_encoder->crtc_mask = (1 <<0 ) | (1 <<1 ) | (1 <<2 ); intel_encoder->cloneable =0 ;
drivers/gpu/drm/i915/intel_dp.c +1 -0
@@ -5832,6 +5832,7 @@ bool intel_dp_init(struct drm_device *dev, intel_encoder->crtc_mask = (1 <<0 ) | (1 <<1 ) | (1 <<2 ); } intel_encoder->cloneable =0 ; + intel_encoder->port = port; intel_dig_port->hpd_pulse = intel_dp_hpd_pulse; dev_priv->hotplug.irq_port[port] = intel_dig_port;
drivers/gpu/drm/i915/intel_dp_mst.c +1 -0
@@ -523,6 +523,7 @@ intel_dp_create_fake_mst_encoder(struct intel_digital_port *intel_dig_port, enum DRM_MODE_ENCODER_DPMST, "DP-MST %c", pipe_name(pipe)); intel_encoder->type =INTEL_OUTPUT_DP_MST ; + intel_encoder->port = intel_dig_port->port; intel_encoder->crtc_mask =0x7 ; intel_encoder->cloneable =0 ;
drivers/gpu/drm/i915/intel_drv.h +1 -0
@@ -206,6 +206,7 @@ struct intel_encoder {struct drm_encoder base;enum intel_output_type type; +enum port port;unsigned int cloneable;void (*hot_plug)(struct intel_encoder *); bool (*compute_config)(struct intel_encoder *,
drivers/gpu/drm/i915/intel_dsi.c +1 -0
@@ -1488,6 +1488,7 @@ void intel_dsi_init(struct drm_device *dev) intel_connector->get_hw_state = intel_connector_get_hw_state; + intel_encoder->port = port;/* * On BYT/CHV, pipe A maps to MIPI DSI port A, pipe B maps to MIPI DSI * port C. BXT isn't limited like this.
drivers/gpu/drm/i915/intel_dvo.c +2 -0
@@ -516,7 +516,9 @@ void intel_dvo_init(struct drm_device *dev) "DVO %c", port_name(port)); intel_encoder->type =INTEL_OUTPUT_DVO ; + intel_encoder->port = port; intel_encoder->crtc_mask = (1 <<0 ) | (1 <<1 ); +switch (dvo->type) {case INTEL_DVO_CHIP_TMDS : intel_encoder->cloneable = (1 << INTEL_OUTPUT_ANALOG) |
drivers/gpu/drm/i915/intel_hdmi.c +1 -0
@@ -1972,6 +1972,7 @@ void intel_hdmi_init(struct drm_device *dev, } intel_encoder->type =INTEL_OUTPUT_HDMI ; + intel_encoder->port = port;if (IS_CHERRYVIEW (dev)) {if (port ==PORT_D ) intel_encoder->crtc_mask =1 <<2 ;
drivers/gpu/drm/i915/intel_lvds.c +2 -1
@@ -1064,8 +1064,9 @@ void intel_lvds_init(struct drm_device *dev) intel_connector->get_hw_state = intel_connector_get_hw_state;intel_connector_attach_encoder (intel_connector, intel_encoder); - intel_encoder->type =INTEL_OUTPUT_LVDS ; + intel_encoder->type =INTEL_OUTPUT_LVDS ; + intel_encoder->port =PORT_NONE ; intel_encoder->cloneable =0 ;if (HAS_PCH_SPLIT (dev)) intel_encoder->crtc_mask = (1 <<0 ) | (1 <<1 ) | (1 <<2 );
drivers/gpu/drm/i915/intel_sdvo.c +1 -0
@@ -2981,6 +2981,7 @@ bool intel_sdvo_init(struct drm_device *dev,/* encoder type will be decided later */ intel_encoder = &intel_sdvo->base; intel_encoder->type =INTEL_OUTPUT_SDVO ; + intel_encoder->port = port;drm_encoder_init (dev, &intel_encoder->base, &intel_sdvo_enc_funcs,0 ,"SDVO %c" ,port_name (port));
drivers/gpu/drm/i915/intel_tv.c +2 -0
@@ -1610,7 +1610,9 @@ intel_tv_init(struct drm_device *dev) intel_connector->get_hw_state = intel_connector_get_hw_state;intel_connector_attach_encoder (intel_connector, intel_encoder); + intel_encoder->type =INTEL_OUTPUT_TVOUT ; + intel_encoder->port =PORT_NONE ; intel_encoder->crtc_mask = (1 <<0 ) | (1 <<1 ); intel_encoder->cloneable =0 ; intel_encoder->base.possible_crtcs = ((1 <<0 ) | (1 <<1 ));
Signature · 6 lines
2.5.0 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v7 3/5 drm/i915: Switch to using port stored in intel_encoder
In reply to Dhinakaran PandiyanFrom: "Pandiyan, Dhinakaran" <[email protected]>
Now that we have the port enum stored in intel_encoder, use that instead of dereferencing intel_dig_port. Saves us a few locals.
struct intel_encoder variables have been renamed to be consistent and convey type information.
v2:
Fix incorrect 'enum port' member names - s/attached_port/port
--- drivers/gpu/drm/i915/intel_audio.c | 32 ++++++++++++++------------------ 1 file changed, 14 insertions(+), 18 deletions(-)
drivers/gpu/drm/i915/intel_audio.c +14 -18
@@ -276,17 +276,15 @@ static void hsw_audio_codec_disable(struct intel_encoder *encoder) }static void hsw_audio_codec_enable (struct drm_connector *connector, -struct intel_encoder *encoder, +struct intel_encoder *intel_encoder,const struct drm_display_mode *adjusted_mode) {struct drm_i915_private *dev_priv =to_i915 (connector->dev); -struct intel_crtc *intel_crtc =to_intel_crtc (encoder->base.crtc); +struct intel_crtc *intel_crtc =to_intel_crtc (intel_encoder->base.crtc);enum pipe pipe = intel_crtc->pipe; +enum port port = intel_encoder->port;struct i915_audio_component *acomp = dev_priv->audio_component;const uint8_t *eld = connector->eld; -struct intel_digital_port *intel_dig_port = -enc_to_dig_port (&encoder->base); -enum port port = intel_dig_port->port;uint32_t tmp;int len, i;int n, rate;
@@ -355,12 +353,12 @@ static void hsw_audio_codec_enable(struct drm_connector *connector,mutex_unlock (&dev_priv->av_mutex); } -static void ilk_audio_codec_disable (struct intel_encoder *encoder) +static void ilk_audio_codec_disable (struct intel_encoder *intel_encoder) { -struct drm_i915_private *dev_priv =to_i915 (encoder->base.dev); -struct intel_crtc *intel_crtc =to_intel_crtc (encoder->base.crtc); -enum port port =enc_to_dig_port (&encoder->base)->port; +struct drm_i915_private *dev_priv =to_i915 (intel_encoder->base.dev); +struct intel_crtc *intel_crtc =to_intel_crtc (intel_encoder->base.crtc);enum pipe pipe = intel_crtc->pipe; +enum port port = intel_encoder->port;uint32_t tmp, eldv;i915_reg_t aud_config, aud_cntrl_st2;
@@ -400,13 +398,13 @@ static void ilk_audio_codec_disable(struct intel_encoder *encoder) }static void ilk_audio_codec_enable (struct drm_connector *connector, -struct intel_encoder *encoder, +struct intel_encoder *intel_encoder,const struct drm_display_mode *adjusted_mode) {struct drm_i915_private *dev_priv =to_i915 (connector->dev); -struct intel_crtc *intel_crtc =to_intel_crtc (encoder->base.crtc); -enum port port =enc_to_dig_port (&encoder->base)->port; +struct intel_crtc *intel_crtc =to_intel_crtc (intel_encoder->base.crtc);enum pipe pipe = intel_crtc->pipe; +enum port port = intel_encoder->port;uint8_t *eld = connector->eld;uint32_t tmp, eldv;int len, i;
@@ -490,11 +488,10 @@ void intel_audio_codec_enable(struct intel_encoder *intel_encoder)struct intel_crtc *crtc =to_intel_crtc (encoder->crtc);const struct drm_display_mode *adjusted_mode = &crtc->config->base.adjusted_mode;struct drm_connector *connector; -struct drm_device *dev = encoder->dev; -struct drm_i915_private *dev_priv =to_i915 (dev); +struct drm_i915_private *dev_priv =to_i915 (encoder->dev);struct i915_audio_component *acomp = dev_priv->audio_component;struct intel_digital_port *intel_dig_port =enc_to_dig_port (encoder); -enum port port = intel_dig_port->port; +enum port port = intel_encoder->port; connector =drm_select_eld (encoder);if (!connector)
@@ -537,11 +534,10 @@ void intel_audio_codec_enable(struct intel_encoder *intel_encoder)void intel_audio_codec_disable (struct intel_encoder *intel_encoder) {struct drm_encoder *encoder = &intel_encoder->base; -struct drm_device *dev = encoder->dev; -struct drm_i915_private *dev_priv =to_i915 (dev); +struct drm_i915_private *dev_priv =to_i915 (encoder->dev);struct i915_audio_component *acomp = dev_priv->audio_component;struct intel_digital_port *intel_dig_port =enc_to_dig_port (encoder); -enum port port = intel_dig_port->port; +enum port port = intel_encoder->port;if (dev_priv->display.audio_codec_disable) dev_priv->display.audio_codec_disable (intel_encoder);
Signature · 6 lines
2.5.0 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v7 4/5 drm/i915: Move audio_connector to intel_encoder
In reply to Dhinakaran PandiyanFrom: "Pandiyan, Dhinakaran" <[email protected]>
With DP MST, a digital_port can carry more than one audio stream. Hence, more than one audio_connector needs to be attached to intel_digital_port in such cases. However, each stream is associated with an unique encoder. So, instead of creating an array of audio_connectors per port, move audio_connector from struct intel_digital_port to struct intel_encoder. This also simplifies access to the right audio_connector from codec functions in intel_audio.c that receive intel_encoder.
v2: Removed locals that are not needed anymore.
v3: No code change except for minor change in context.
--- drivers/gpu/drm/i915/intel_audio.c | 12 ++++-------- drivers/gpu/drm/i915/intel_drv.h | 4 ++-- 2 files changed, 6 insertions(+), 10 deletions(-)
drivers/gpu/drm/i915/intel_audio.c +4 -8
@@ -490,7 +490,6 @@ void intel_audio_codec_enable(struct intel_encoder *intel_encoder)struct drm_connector *connector;struct drm_i915_private *dev_priv =to_i915 (encoder->dev);struct i915_audio_component *acomp = dev_priv->audio_component; -struct intel_digital_port *intel_dig_port =enc_to_dig_port (encoder);enum port port = intel_encoder->port; connector =drm_select_eld (encoder);
@@ -515,7 +514,7 @@ void intel_audio_codec_enable(struct intel_encoder *intel_encoder) adjusted_mode);mutex_lock (&dev_priv->av_mutex); - intel_dig_port->audio_connector = connector; + intel_encoder->audio_connector = connector;/* referred in audio callbacks */ dev_priv->dig_port_map[port] = intel_encoder;mutex_unlock (&dev_priv->av_mutex);
@@ -536,14 +535,13 @@ void intel_audio_codec_disable(struct intel_encoder *intel_encoder)struct drm_encoder *encoder = &intel_encoder->base;struct drm_i915_private *dev_priv =to_i915 (encoder->dev);struct i915_audio_component *acomp = dev_priv->audio_component; -struct intel_digital_port *intel_dig_port =enc_to_dig_port (encoder);enum port port = intel_encoder->port;if (dev_priv->display.audio_codec_disable) dev_priv->display.audio_codec_disable (intel_encoder);mutex_lock (&dev_priv->av_mutex); - intel_dig_port->audio_connector =NULL ; + intel_encoder->audio_connector =NULL ; dev_priv->dig_port_map[port] =NULL ;mutex_unlock (&dev_priv->av_mutex);
@@ -704,7 +702,6 @@ static int i915_audio_component_get_eld(struct device *kdev, int port, {struct drm_i915_private *dev_priv =kdev_to_i915 (kdev);struct intel_encoder *intel_encoder; -struct intel_digital_port *intel_dig_port;const u8 *eld;int ret = -EINVAL ;
@@ -713,10 +710,9 @@ static int i915_audio_component_get_eld(struct device *kdev, int port,/* intel_encoder might be NULL for DP MST */ if (intel_encoder) { ret =0 ; - intel_dig_port =enc_to_dig_port (&intel_encoder->base); - *enabled = intel_dig_port->audio_connector !=NULL ; + *enabled = intel_encoder->audio_connector !=NULL ;if (*enabled) { - eld = intel_dig_port->audio_connector->eld; + eld = intel_encoder->audio_connector->eld; ret =drm_eld_size (eld);memcpy (buf, eld,min (max_bytes, ret)); }
drivers/gpu/drm/i915/intel_drv.h +2 -2
@@ -248,6 +248,8 @@ struct intel_encoder {void (*suspend)(struct intel_encoder *);int crtc_mask;enum hpd_pin hpd_pin; +/* for communication with audio component; protected by av_mutex */ +const struct drm_connector *audio_connector; };struct intel_panel {
@@ -959,8 +961,6 @@ struct intel_digital_port {enum irqreturn (*hpd_pulse)(struct intel_digital_port *,bool );bool release_cl2_override;uint8_t max_lanes; -/* for communication with audio component; protected by av_mutex */ -const struct drm_connector *audio_connector; };struct intel_dp_mst_encoder {
Signature · 6 lines
2.5.0 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v7 5/5 drm/i915: start adding dp mst audio
In reply to Dhinakaran PandiyanFrom: 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.
--- 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
@@ -2865,6 +2865,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) {
@@ -2907,7 +2921,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
@@ -2230,6 +2230,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) {
@@ -2295,11 +2308,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); + } } 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
@@ -1155,6 +1155,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.5.0 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Jani Nikula
maintainerRe: [PATCH v7 5/5] drm/i915: start adding dp mst audio
Quoted 12 lines · Dhinakaran Pandiyan
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.Another separated patches to support DP MST audio will be implemented in audio driver.
Quoted 6 lines
v2:
Rebased.Signed-off-by Libin Yang <[email protected]>Signed-off-by Dhinakaran Pandiyan <[email protected]>Reviewed-by Lyude <[email protected]>
This patch causes a regression on a DP MST multi-monitor setup:
https://bugs.freedesktop.org/show_bug.cgi?id=97907
BR,
Jani.
Quoted 159 lines
--- 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@@ -2865,6 +2865,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) {@@ -2907,7 +2921,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@@ -2230,6 +2230,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) {@@ -2295,11 +2308,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); + } } 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@@ -1155,6 +1155,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
Patchwork
CI✗ Fi.CI.BAT: warning for Prep. for DP audio MST support (rev11)
In reply to Dhinakaran Pandiyan== Series Details ==
== Series Details ==
Series: Prep. for DP audio MST support (rev11)
URL : https://patchwork.freedesktop.org/series/11129/
State : warning
== Summary ==
Series 11129v11 Prep. for DP audio MST support
https://patchwork.freedesktop.org/api/1.0/series/11129/revisions/11/mbox/
Test kms_pipe_crc_basic:
Subgroup read-crc-pipe-a:
pass -> SKIP (fi-hsw-4770r)
Subgroup read-crc-pipe-b:
pass -> SKIP (fi-hsw-4770r)fi-bdw-5557u total:244 pass:229 dwarn:0 dfail:0 fail:0 skip:15 fi-bsw-n3050 total:244 pass:202 dwarn:0 dfail:0 fail:0 skip:42 fi-byt-n2820 total:244 pass:208 dwarn:0 dfail:0 fail:1 skip:35 fi-hsw-4770k total:244 pass:226 dwarn:0 dfail:0 fail:0 skip:18 fi-hsw-4770r total:244 pass:220 dwarn:0 dfail:0 fail:0 skip:24 fi-ilk-650 total:244 pass:183 dwarn:0 dfail:0 fail:1 skip:60 fi-ivb-3520m total:244 pass:219 dwarn:0 dfail:0 fail:0 skip:25 fi-ivb-3770 total:244 pass:207 dwarn:0 dfail:0 fail:0 skip:37 fi-skl-6260u total:244 pass:230 dwarn:0 dfail:0 fail:0 skip:14 fi-skl-6700hq total:244 pass:221 dwarn:0 dfail:0 fail:1 skip:22 fi-skl-6700k total:244 pass:219 dwarn:1 dfail:0 fail:0 skip:24 fi-skl-6770hq total:244 pass:228 dwarn:1 dfail:0 fail:1 skip:14 fi-snb-2520m total:244 pass:208 dwarn:0 dfail:0 fail:0 skip:36 fi-snb-2600 total:244 pass:207 dwarn:0 dfail:0 fail:0 skip:37
Results at /archive/results/CI_IGT_test/Patchwork_2558/
4c518aef024daa0223692124baa2d7399f54dd97 drm-intel-nightly: 2016y-09m-19d-20h-40m-51s UTC integration manifest cf4f6db drm/i915: start adding dp mst audio
35f6d98 drm/i915: Move audio_connector to intel_encoder
99dc209 drm/i915: Switch to using port stored in intel_encoder
2ff487f drm/i915: Store port enum in intel_encoder
909c816 drm/i915: Standardize port type for DVO encoders
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Series merged to dinq.
Thanks for the patches
Quoted 56 lines · Dhinakaran Pandiyan
This series lays the groundwork for more DP MST audio work that will follow.
v7:
Added R-B tags and rebased.v6:
Modified the return type for a helper that returns port inintel_dvo.cv5:
Really renamed the port enum member from 'attached_port' to 'port' Rebased on atomic changes.v4:
Fixed missing port initialization inintel_sdvo.cRenamed the port enum member from 'attached_port' to 'port' Fixed commit message typos.v3:
Different solution to get port from encoder (danvet). Removed locals that are not needed any more.
Minor variable renaming clean up.
Rebased on dinq.
Retained r-b for "start adding dp mst audio" as it does not change.v2:
Different solution replacing theenc_to_dig_port()fix (Ville, Lyude). No changes to MST audio enabling and moveaudio_connectorpatches. Reordered the patches (Lyude)Pandiyan, Dhinakaran (4):
drm/i915: Standardize port type for DVO encoders drm/i915: Store port enum inintel_encoderdrm/i915: Switch to using port stored inintel_encoderdrm/i915: Moveaudio_connectortointel_encoderLibin Yang (1):
drm/i915: start adding dp mst audiodrivers/gpu/drm/i915/i915_debugfs.c | 19 +++++++++++++++- drivers/gpu/drm/i915/i915_drv.h | 1 + drivers/gpu/drm/i915/intel_audio.c | 44 +++++++++++++++---------------------- drivers/gpu/drm/i915/intel_crt.c | 2 ++ drivers/gpu/drm/i915/intel_ddi.c | 21 +++++++++++++----- drivers/gpu/drm/i915/intel_dp.c | 1 + drivers/gpu/drm/i915/intel_dp_mst.c | 19 ++++++++++++++++ drivers/gpu/drm/i915/intel_drv.h | 7 ++++-- drivers/gpu/drm/i915/intel_dsi.c | 1 + drivers/gpu/drm/i915/intel_dvo.c | 16 ++++++++------ drivers/gpu/drm/i915/intel_hdmi.c | 1 + drivers/gpu/drm/i915/intel_lvds.c | 3 ++- drivers/gpu/drm/i915/intel_sdvo.c | 1 + drivers/gpu/drm/i915/intel_tv.c | 2 ++ 14 files changed, 96 insertions(+), 42 deletions(-)
Quoted 8 lines
--
2.5.0_______________________________________________
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