[Intel-gfx] [PATCH v4 2/4] drm/i915: Switch to using port stored in intel_encoder

[Pandiyan, Dhinakaran]

Just realized this patch needs s/attached_port/port, will send out
another version.


On Mon, 2016-08-29 at 17:23 -0400, Lyude Paul wrote:
> Looks like a much better solution then the previous one.
> 
> Reviewed-by: Lyude <cpaul at redhat.com>
> 
> On Wed, 2016-08-24 at 00:22 -0700, Dhinakaran Pandiyan wrote:
> > 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.
> > 
> > Signed-off-by: Dhinakaran Pandiyan <dhinakaran.pandiyan at intel.com>
> > ---
> >  drivers/gpu/drm/i915/intel_audio.c | 39 +++++++++++++++--------------------
> > ---
> >  1 file changed, 15 insertions(+), 24 deletions(-)
> > 
> > diff --git a/drivers/gpu/drm/i915/intel_audio.c
> > b/drivers/gpu/drm/i915/intel_audio.c
> > index d32f586..5a41439 100644
> > --- a/drivers/gpu/drm/i915/intel_audio.c
> > +++ b/drivers/gpu/drm/i915/intel_audio.c
> > @@ -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->attached_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,14 +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);
> > -	struct intel_digital_port *intel_dig_port =
> > -		enc_to_dig_port(&encoder->base);
> > -	enum port port = intel_dig_port->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->attached_port;
> >  	uint32_t tmp, eldv;
> >  	i915_reg_t aud_config, aud_cntrl_st2;
> >  
> > @@ -402,18 +398,15 @@ 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);
> > -	struct intel_digital_port *intel_dig_port =
> > -		enc_to_dig_port(&encoder->base);
> > -	enum port port = intel_dig_port->port;
> > +	struct intel_crtc *intel_crtc = to_intel_crtc(intel_encoder-
> > >base.crtc);
> >  	enum pipe pipe = intel_crtc->pipe;
> > +	enum port port = intel_encoder->attached_port;
> >  	uint8_t *eld = connector->eld;
> > -	uint32_t eldv;
> > -	uint32_t tmp;
> > +	uint32_t tmp, eldv;
> >  	int len, i;
> >  	i915_reg_t hdmiw_hdmiedid, aud_config, aud_cntl_st, aud_cntrl_st2;
> >  
> > @@ -495,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->attached_port;
> >  
> >  	connector = drm_select_eld(encoder);
> >  	if (!connector)
> > @@ -542,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->attached_port;
> >  
> >  	if (dev_priv->display.audio_codec_disable)
> >  		dev_priv->display.audio_codec_disable(intel_encoder);