Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3af306d9 authored by Jani Nikula's avatar Jani Nikula
Browse files

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@linux.intel.com>
Reviewed-by: default avatarLibin Yang <libin.yang@intel.com>
Signed-off-by: default avatarJani Nikula <jani.nikula@intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/8cf454ccefc05b234aa81c45a4ce9018e7c9324f.1476111629.git.jani.nikula@intel.com
parent 6c26291d

drivers/gpu/drm/i915/intel_audio.c

+2 −10
Original line number Original line Diff line number Diff line
@@ -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 drm_i915_private *dev_priv = to_i915(intel_crtc->base.dev);

	struct i915_audio_component *acomp = dev_priv->audio_component;

	struct i915_audio_component *acomp = dev_priv->audio_component;

	int rate = acomp ? acomp->aud_sample_rate[port] : 0;

	enum pipe pipe = intel_crtc->pipe;

	enum pipe pipe = intel_crtc->pipe;

	int n, rate;

	int n;

	u32 tmp;

	u32 tmp;





	tmp = I915_READ(HSW_AUD_CFG(pipe));

	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;

	tmp &= ~AUD_CONFIG_N_PROG_ENABLE;

	if (audio_rate_need_prog(intel_crtc, adjusted_mode)) {

	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);

		n = audio_config_get_n(adjusted_mode, rate);

		if (n != 0)

		if (n != 0)

			tmp = audio_config_setup_n_reg(n, tmp);

			tmp = audio_config_setup_n_reg(n, tmp);