diff options
| author | Jani Nikula | 2016-10-10 17:04:01 +0200 |
|---|---|---|
| committer | Jani Nikula | 2016-10-11 16:22:15 +0200 |
| commit | 3af306d905b530bf076a983b14af23d133772eea (patch) | |
| tree | c7a034b45afaea2978c0d38476049cf11ec576b2 /drivers/gpu/drm/i915/intel_audio.c | |
| parent | drm/i915/audio: abstract audio config update (diff) | |
| download | kernel-qcow2-linux-3af306d905b530bf076a983b14af23d133772eea.tar.gz kernel-qcow2-linux-3af306d905b530bf076a983b14af23d133772eea.tar.xz kernel-qcow2-linux-3af306d905b530bf076a983b14af23d133772eea.zip | |
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: Libin Yang <libin.yang@intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/8cf454ccefc05b234aa81c45a4ce9018e7c9324f.1476111629.git.jani.nikula@intel.com
Diffstat (limited to 'drivers/gpu/drm/i915/intel_audio.c')
| -rw-r--r-- | drivers/gpu/drm/i915/intel_audio.c | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/drivers/gpu/drm/i915/intel_audio.c b/drivers/gpu/drm/i915/intel_audio.c index d452e7b86053..58a222f36a87 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); |