| Message ID | 1470188796-31850-3-git-send-email-dhinakaran.pandiyan@intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
Add Takashi Regards, Libin > -----Original Message----- > From: Pandiyan, Dhinakaran > Sent: Wednesday, August 3, 2016 9:47 AM > To: intel-gfx@lists.freedesktop.org > Cc: cpaul@redhat.com; ville.syrjala@linux.intel.com; Yang, Libin > <libin.yang@intel.com>; Pandiyan, Dhinakaran > <dhinakaran.pandiyan@intel.com> > Subject: [PATCH 2/3] drm/i915: Move audio_connector to intel_encoder > > 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. > > Signed-off-by: Dhinakaran Pandiyan <dhinakaran.pandiyan@intel.com> > --- > drivers/gpu/drm/i915/intel_audio.c | 10 ++++------ > drivers/gpu/drm/i915/intel_drv.h | 4 ++-- > 2 files changed, 6 insertions(+), 8 deletions(-) > > diff --git a/drivers/gpu/drm/i915/intel_audio.c > b/drivers/gpu/drm/i915/intel_audio.c > index 6700a7b..8c493de 100644 > --- a/drivers/gpu/drm/i915/intel_audio.c > +++ b/drivers/gpu/drm/i915/intel_audio.c > @@ -523,7 +523,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); > @@ -552,7 +552,7 @@ void intel_audio_codec_disable(struct intel_encoder > *intel_encoder) > 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); > > @@ -707,7 +707,6 @@ static int i915_audio_component_get_eld(struct > device *dev, int port, { > struct drm_i915_private *dev_priv = dev_to_i915(dev); > struct intel_encoder *intel_encoder; > - struct intel_digital_port *intel_dig_port; > const u8 *eld; > int ret = -EINVAL; > > @@ -716,10 +715,9 @@ static int i915_audio_component_get_eld(struct > device *dev, 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)); > } > diff --git a/drivers/gpu/drm/i915/intel_drv.h > b/drivers/gpu/drm/i915/intel_drv.h > index f73de63c..45020d2 100644 > --- a/drivers/gpu/drm/i915/intel_drv.h > +++ b/drivers/gpu/drm/i915/intel_drv.h > @@ -220,6 +220,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 { > @@ -929,8 +931,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 { > -- > 2.5.0
Reviewed-by: Lyude <cpaul@redhat.com> On Tue, 2016-08-02 at 18:46 -0700, Dhinakaran Pandiyan wrote: > 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. > > Signed-off-by: Dhinakaran Pandiyan <dhinakaran.pandiyan@intel.com> > --- > drivers/gpu/drm/i915/intel_audio.c | 10 ++++------ > drivers/gpu/drm/i915/intel_drv.h | 4 ++-- > 2 files changed, 6 insertions(+), 8 deletions(-) > > diff --git a/drivers/gpu/drm/i915/intel_audio.c > b/drivers/gpu/drm/i915/intel_audio.c > index 6700a7b..8c493de 100644 > --- a/drivers/gpu/drm/i915/intel_audio.c > +++ b/drivers/gpu/drm/i915/intel_audio.c > @@ -523,7 +523,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); > @@ -552,7 +552,7 @@ void intel_audio_codec_disable(struct > intel_encoder *intel_encoder) > 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); > > @@ -707,7 +707,6 @@ static int i915_audio_component_get_eld(struct > device *dev, int port, > { > struct drm_i915_private *dev_priv = dev_to_i915(dev); > struct intel_encoder *intel_encoder; > - struct intel_digital_port *intel_dig_port; > const u8 *eld; > int ret = -EINVAL; > > @@ -716,10 +715,9 @@ static int i915_audio_component_get_eld(struct > device *dev, 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)); > } > diff --git a/drivers/gpu/drm/i915/intel_drv.h > b/drivers/gpu/drm/i915/intel_drv.h > index f73de63c..45020d2 100644 > --- a/drivers/gpu/drm/i915/intel_drv.h > +++ b/drivers/gpu/drm/i915/intel_drv.h > @@ -220,6 +220,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 { > @@ -929,8 +931,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 {
diff --git a/drivers/gpu/drm/i915/intel_audio.c b/drivers/gpu/drm/i915/intel_audio.c index 6700a7b..8c493de 100644 --- a/drivers/gpu/drm/i915/intel_audio.c +++ b/drivers/gpu/drm/i915/intel_audio.c @@ -523,7 +523,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); @@ -552,7 +552,7 @@ void intel_audio_codec_disable(struct intel_encoder *intel_encoder) 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); @@ -707,7 +707,6 @@ static int i915_audio_component_get_eld(struct device *dev, int port, { struct drm_i915_private *dev_priv = dev_to_i915(dev); struct intel_encoder *intel_encoder; - struct intel_digital_port *intel_dig_port; const u8 *eld; int ret = -EINVAL; @@ -716,10 +715,9 @@ static int i915_audio_component_get_eld(struct device *dev, 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)); } diff --git a/drivers/gpu/drm/i915/intel_drv.h b/drivers/gpu/drm/i915/intel_drv.h index f73de63c..45020d2 100644 --- a/drivers/gpu/drm/i915/intel_drv.h +++ b/drivers/gpu/drm/i915/intel_drv.h @@ -220,6 +220,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 { @@ -929,8 +931,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 {
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. Signed-off-by: Dhinakaran Pandiyan <dhinakaran.pandiyan@intel.com> --- drivers/gpu/drm/i915/intel_audio.c | 10 ++++------ drivers/gpu/drm/i915/intel_drv.h | 4 ++-- 2 files changed, 6 insertions(+), 8 deletions(-)