[RESEND,3/9] drm/i915/audio: use the same code for updating audio config

Submitted by Jani Nikula on Oct. 10, 2016, 3:04 p.m.

Details

Message ID e0e88ec00c0ed1734083153b55283efd3116be5c.1476111629.git.jani.nikula@intel.com
State New
Headers show
Series "drm/i915/audio: audio cleanups, 4k fixes" ( rev: 4 3 ) in Intel GFX

Not browsing as part of any series.

Commit Message

Jani Nikula Oct. 10, 2016, 3:04 p.m.
It gets fragile to duplicate the code for updating HSW_AUD_CFG. The only
change should be that the hdmi pixel clock is also updated in
i915_audio_component_sync_audio_rate(), but it should not be any
different.

Cc: Libin Yang <libin.yang@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
---
 drivers/gpu/drm/i915/intel_audio.c | 29 +++--------------------------
 1 file changed, 3 insertions(+), 26 deletions(-)

Patch hide | download patch | download mbox

diff --git a/drivers/gpu/drm/i915/intel_audio.c b/drivers/gpu/drm/i915/intel_audio.c
index 5d0bd07afa51..4d62b3e8ac19 100644
--- a/drivers/gpu/drm/i915/intel_audio.c
+++ b/drivers/gpu/drm/i915/intel_audio.c
@@ -671,10 +671,8 @@  static int i915_audio_component_sync_audio_rate(struct device *kdev, int port,
 	struct drm_i915_private *dev_priv = kdev_to_i915(kdev);
 	struct intel_encoder *intel_encoder;
 	struct intel_crtc *crtc;
-	struct drm_display_mode *mode;
+	struct drm_display_mode *adjusted_mode;
 	struct i915_audio_component *acomp = dev_priv->audio_component;
-	u32 tmp;
-	int n;
 	int err = 0;
 
 	/* HSW, BDW, SKL, KBL need this fix */
@@ -700,33 +698,12 @@  static int i915_audio_component_sync_audio_rate(struct device *kdev, int port,
 	crtc = to_intel_crtc(intel_encoder->base.crtc);
 	pipe = crtc->pipe;
 
-	mode = &crtc->config->base.adjusted_mode;
+	adjusted_mode = &crtc->config->base.adjusted_mode;
 
 	/* port must be valid now, otherwise the pipe will be invalid */
 	acomp->aud_sample_rate[port] = rate;
 
-	/* 2. check whether to set the N/CTS/M manually or not */
-	if (!audio_rate_need_prog(crtc, mode)) {
-		tmp = I915_READ(HSW_AUD_CFG(pipe));
-		tmp &= ~AUD_CONFIG_N_PROG_ENABLE;
-		I915_WRITE(HSW_AUD_CFG(pipe), tmp);
-		goto unlock;
-	}
-
-	n = audio_config_get_n(mode, rate);
-	if (n == 0) {
-		DRM_DEBUG_KMS("Using automatic mode for N value on port %c\n",
-					  port_name(port));
-		tmp = I915_READ(HSW_AUD_CFG(pipe));
-		tmp &= ~AUD_CONFIG_N_PROG_ENABLE;
-		I915_WRITE(HSW_AUD_CFG(pipe), tmp);
-		goto unlock;
-	}
-
-	/* 3. set the N/CTS/M */
-	tmp = I915_READ(HSW_AUD_CFG(pipe));
-	tmp = audio_config_setup_n_reg(n, tmp);
-	I915_WRITE(HSW_AUD_CFG(pipe), tmp);
+	hsw_audio_config_update(crtc, port, adjusted_mode);
 
  unlock:
 	mutex_unlock(&dev_priv->av_mutex);

Comments

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


Regards,
Libin


> -----Original Message-----

> From: Intel-gfx [mailto:intel-gfx-bounces@lists.freedesktop.org] On Behalf Of

> Jani Nikula

> Sent: Monday, October 10, 2016 11:04 PM

> To: intel-gfx@lists.freedesktop.org

> Cc: Nikula, Jani <jani.nikula@intel.com>; libin.yang@linux.intel.com;

> Pandiyan, Dhinakaran <dhinakaran.pandiyan@intel.com>

> Subject: [Intel-gfx] [PATCH RESEND 3/9] drm/i915/audio: use the same code

> for updating audio config

> 

> It gets fragile to duplicate the code for updating HSW_AUD_CFG. The only

> change should be that the hdmi pixel clock is also updated in

> i915_audio_component_sync_audio_rate(), but it should not be any

> different.

> 

> Cc: Libin Yang <libin.yang@linux.intel.com>

> Signed-off-by: Jani Nikula <jani.nikula@intel.com>

> ---

>  drivers/gpu/drm/i915/intel_audio.c | 29 +++--------------------------

>  1 file changed, 3 insertions(+), 26 deletions(-)

> 

> diff --git a/drivers/gpu/drm/i915/intel_audio.c

> b/drivers/gpu/drm/i915/intel_audio.c

> index 5d0bd07afa51..4d62b3e8ac19 100644

> --- a/drivers/gpu/drm/i915/intel_audio.c

> +++ b/drivers/gpu/drm/i915/intel_audio.c

> @@ -671,10 +671,8 @@ static int

> i915_audio_component_sync_audio_rate(struct device *kdev, int port,

>  	struct drm_i915_private *dev_priv = kdev_to_i915(kdev);

>  	struct intel_encoder *intel_encoder;

>  	struct intel_crtc *crtc;

> -	struct drm_display_mode *mode;

> +	struct drm_display_mode *adjusted_mode;

>  	struct i915_audio_component *acomp = dev_priv-

> >audio_component;

> -	u32 tmp;

> -	int n;

>  	int err = 0;

> 

>  	/* HSW, BDW, SKL, KBL need this fix */ @@ -700,33 +698,12 @@

> static int i915_audio_component_sync_audio_rate(struct device *kdev, int

> port,

>  	crtc = to_intel_crtc(intel_encoder->base.crtc);

>  	pipe = crtc->pipe;

> 

> -	mode = &crtc->config->base.adjusted_mode;

> +	adjusted_mode = &crtc->config->base.adjusted_mode;

> 

>  	/* port must be valid now, otherwise the pipe will be invalid */

>  	acomp->aud_sample_rate[port] = rate;

> 

> -	/* 2. check whether to set the N/CTS/M manually or not */

> -	if (!audio_rate_need_prog(crtc, mode)) {

> -		tmp = I915_READ(HSW_AUD_CFG(pipe));

> -		tmp &= ~AUD_CONFIG_N_PROG_ENABLE;

> -		I915_WRITE(HSW_AUD_CFG(pipe), tmp);

> -		goto unlock;

> -	}

> -

> -	n = audio_config_get_n(mode, rate);

> -	if (n == 0) {

> -		DRM_DEBUG_KMS("Using automatic mode for N value on

> port %c\n",

> -					  port_name(port));

> -		tmp = I915_READ(HSW_AUD_CFG(pipe));

> -		tmp &= ~AUD_CONFIG_N_PROG_ENABLE;

> -		I915_WRITE(HSW_AUD_CFG(pipe), tmp);

> -		goto unlock;

> -	}

> -

> -	/* 3. set the N/CTS/M */

> -	tmp = I915_READ(HSW_AUD_CFG(pipe));

> -	tmp = audio_config_setup_n_reg(n, tmp);

> -	I915_WRITE(HSW_AUD_CFG(pipe), tmp);

> +	hsw_audio_config_update(crtc, port, adjusted_mode);

> 

>   unlock:

>  	mutex_unlock(&dev_priv->av_mutex);

> --

> 2.1.4

> 

> _______________________________________________

> Intel-gfx mailing list

> Intel-gfx@lists.freedesktop.org

> https://lists.freedesktop.org/mailman/listinfo/intel-gfx