All of lore.kernel.org
 help / color / mirror / Atom feed
From: Lyude Paul <cpaul@redhat.com>
To: Dhinakaran Pandiyan <dhinakaran.pandiyan@intel.com>,
	intel-gfx@lists.freedesktop.org
Cc: Daniel Vetter <daniel.vetter@ffwll.ch>, libin.yang@linux.intel.com
Subject: Re: [PATCH v5 2/4] drm/i915: Switch to using port stored in intel_encoder
Date: Wed, 31 Aug 2016 23:14:53 -0400	[thread overview]
Message-ID: <1472699693.5090.0.camel@redhat.com> (raw)
In-Reply-To: <1472689226-6279-3-git-send-email-dhinakaran.pandiyan@intel.com>

Reviewed-by: Lyude <cpaul@redhat.com>

On Wed, 2016-08-31 at 17:20 -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.
> 
> v2:
> Fix incorrect 'enum port' member names - s/attached_port/port
> 
> Signed-off-by: Dhinakaran Pandiyan <dhinakaran.pandiyan@intel.com>
> ---
>  drivers/gpu/drm/i915/intel_audio.c | 32 ++++++++++++++------------------
>  1 file changed, 14 insertions(+), 18 deletions(-)
> 
> diff --git a/drivers/gpu/drm/i915/intel_audio.c
> b/drivers/gpu/drm/i915/intel_audio.c
> index 6c70a5b..8f5c685 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->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);
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

  reply	other threads:[~2016-09-01  3:14 UTC|newest]

Thread overview: 11+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-09-01  0:20 [PATCH v5 0/4] Prep. for DP audio MST support Dhinakaran Pandiyan
2016-09-01  0:20 ` [PATCH v5 1/4] drm/i915: Store port enum in intel_encoder Dhinakaran Pandiyan
2016-09-13  1:00   ` [PATCH v6 " Dhinakaran Pandiyan
2016-09-13 19:03     ` Pandiyan, Dhinakaran
2016-09-01  0:20 ` [PATCH v5 2/4] drm/i915: Switch to using port stored " Dhinakaran Pandiyan
2016-09-01  3:14   ` Lyude Paul [this message]
2016-09-01  0:20 ` [PATCH v5 3/4] drm/i915: Move audio_connector to intel_encoder Dhinakaran Pandiyan
2016-09-01  0:20 ` [PATCH v5 4/4] drm/i915: start adding dp mst audio Dhinakaran Pandiyan
2016-09-06 23:21   ` Jim Bride
2016-09-01 10:20 ` ✗ Fi.CI.BAT: failure for Prep. for DP audio MST support (rev8) Patchwork
2016-09-13  1:19 ` ✓ Fi.CI.BAT: success for Prep. for DP audio MST support (rev9) Patchwork

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1472699693.5090.0.camel@redhat.com \
    --to=cpaul@redhat.com \
    --cc=daniel.vetter@ffwll.ch \
    --cc=dhinakaran.pandiyan@intel.com \
    --cc=intel-gfx@lists.freedesktop.org \
    --cc=libin.yang@linux.intel.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.