[Intel-gfx] [PATCH v2 03/15] drm/i915/audio: Unify get_saved_enc()

[Jani Nikula]

On Tue, 08 Nov 2022, Ville Syrjala <ville.syrjala at linux.intel.com> wrote:
> From: Ville Syrjälä <ville.syrjala at linux.intel.com>
>
> Make the two branches of get_saved_enc() look alike. Currently
> they look different even though they do exactly the same thing
> apart from == vs. != for the MST comparison.
>
> Cc: Chaitanya Kumar Borah <chaitanya.kumar.borah at intel.com>
> Cc: Kai Vehmanen <kai.vehmanen at linux.intel.com>
> Cc: Takashi Iwai <tiwai at suse.de>
> Signed-off-by: Ville Syrjälä <ville.syrjala at linux.intel.com>

Reviewed-by: Jani Nikula <jani.nikula at intel.com>

> ---
>  drivers/gpu/drm/i915/display/intel_audio.c | 16 +++++++---------
>  1 file changed, 7 insertions(+), 9 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/display/intel_audio.c b/drivers/gpu/drm/i915/display/intel_audio.c
> index 0a53731a9272..0ac28d28098f 100644
> --- a/drivers/gpu/drm/i915/display/intel_audio.c
> +++ b/drivers/gpu/drm/i915/display/intel_audio.c
> @@ -1069,10 +1069,10 @@ static int i915_audio_component_get_cdclk_freq(struct device *kdev)
>  static struct intel_encoder *get_saved_enc(struct drm_i915_private *i915,
>  					   int port, int pipe)
>  {
> -	struct intel_encoder *encoder;
> -
>  	/* MST */
>  	if (pipe >= 0) {
> +		struct intel_encoder *encoder;
> +
>  		if (drm_WARN_ON(&i915->drm,
>  				pipe >= ARRAY_SIZE(i915->display.audio.encoder_map)))
>  			return NULL;
> @@ -1083,7 +1083,7 @@ static struct intel_encoder *get_saved_enc(struct drm_i915_private *i915,
>  		 * MST or not. So it will poll all the port & pipe
>  		 * combinations
>  		 */
> -		if (encoder != NULL && encoder->port == port &&
> +		if (encoder && encoder->port == port &&
>  		    encoder->type == INTEL_OUTPUT_DP_MST)
>  			return encoder;
>  	}
> @@ -1093,14 +1093,12 @@ static struct intel_encoder *get_saved_enc(struct drm_i915_private *i915,
>  		return NULL;
>  
>  	for_each_pipe(i915, pipe) {
> +		struct intel_encoder *encoder;
> +
>  		encoder = i915->display.audio.encoder_map[pipe];
> -		if (encoder == NULL)
> -			continue;
>  
> -		if (encoder->type == INTEL_OUTPUT_DP_MST)
> -			continue;
> -
> -		if (port == encoder->port)
> +		if (encoder && encoder->port == port &&
> +		    encoder->type != INTEL_OUTPUT_DP_MST)
>  			return encoder;
>  	}

-- 
Jani Nikula, Intel Open Source Graphics Center