[Intel-gfx] [PATCH RESEND 2/9] drm/i915/audio: port is going to be just fine, simplify checks

[Yang, Libin]

Reviewed-by: Libin Yang <libin.yang at intel.com>

Regards,
Libin


> -----Original Message-----
> From: Intel-gfx [mailto:intel-gfx-bounces at lists.freedesktop.org] On Behalf Of
> Jani Nikula
> Sent: Monday, October 10, 2016 11:04 PM
> To: intel-gfx at lists.freedesktop.org
> Cc: Nikula, Jani <jani.nikula at intel.com>; libin.yang at linux.intel.com;
> Pandiyan, Dhinakaran <dhinakaran.pandiyan at intel.com>
> Subject: [Intel-gfx] [PATCH RESEND 2/9] drm/i915/audio: port is going to be
> just fine, simplify checks
> 
> If it was wrong, we'd be screwed already.
> 
> Cc: Libin Yang <libin.yang at linux.intel.com>
> Signed-off-by: Jani Nikula <jani.nikula at intel.com>
> ---
>  drivers/gpu/drm/i915/intel_audio.c | 12 ++----------
>  1 file changed, 2 insertions(+), 10 deletions(-)
> 
> diff --git a/drivers/gpu/drm/i915/intel_audio.c
> b/drivers/gpu/drm/i915/intel_audio.c
> index 0a54f7cdce37..5d0bd07afa51 100644
> --- a/drivers/gpu/drm/i915/intel_audio.c
> +++ b/drivers/gpu/drm/i915/intel_audio.c
> @@ -251,8 +251,9 @@ static void hsw_audio_config_update(struct intel_crtc
> *intel_crtc,  {
>  	struct drm_i915_private *dev_priv = to_i915(intel_crtc->base.dev);
>  	struct i915_audio_component *acomp = dev_priv-
> >audio_component;
> +	int rate = acomp ? acomp->aud_sample_rate[port] : 0;
>  	enum pipe pipe = intel_crtc->pipe;
> -	int n, rate;
> +	int n;
>  	u32 tmp;
> 
>  	tmp = I915_READ(HSW_AUD_CFG(pipe));
> @@ -265,15 +266,6 @@ static void hsw_audio_config_update(struct
> intel_crtc *intel_crtc,
> 
>  	tmp &= ~AUD_CONFIG_N_PROG_ENABLE;
>  	if (audio_rate_need_prog(intel_crtc, adjusted_mode)) {
> -		if (!acomp)
> -			rate = 0;
> -		else if (port >= PORT_A && port <= PORT_E)
> -			rate = acomp->aud_sample_rate[port];
> -		else {
> -			DRM_ERROR("invalid port: %d\n", port);
> -			rate = 0;
> -		}
> -
>  		n = audio_config_get_n(adjusted_mode, rate);
>  		if (n != 0)
>  			tmp = audio_config_setup_n_reg(n, tmp);
> --
> 2.1.4
> 
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx at lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/intel-gfx