diff options
| author | Jani Nikula | 2014-10-27 15:26:55 +0100 |
|---|---|---|
| committer | Daniel Vetter | 2014-11-07 18:42:16 +0100 |
| commit | 495a5bb81d3469495d81dbec6290dbb1dfebd673 (patch) | |
| tree | 2a69b31e9dee75e1bd305a2ed3efc7a7fc79b083 /drivers/gpu/drm/i915/intel_hdmi.c | |
| parent | drm/i915/audio: rewrite vlv/chv and gen 5-7 audio codec enable sequence (diff) | |
| download | kernel-qcow2-linux-495a5bb81d3469495d81dbec6290dbb1dfebd673.tar.gz kernel-qcow2-linux-495a5bb81d3469495d81dbec6290dbb1dfebd673.tar.xz kernel-qcow2-linux-495a5bb81d3469495d81dbec6290dbb1dfebd673.zip | |
drm/i915/audio: add vlv/chv/gen5-7 audio codec disable sequence
Add support for disabling the audio codec on vlv/chv/gen5-7, similar to
hsw/bdw.
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Reviewed-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'drivers/gpu/drm/i915/intel_hdmi.c')
| -rw-r--r-- | drivers/gpu/drm/i915/intel_hdmi.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/gpu/drm/i915/intel_hdmi.c b/drivers/gpu/drm/i915/intel_hdmi.c index f29026a1157d..f89f71e1f2ce 100644 --- a/drivers/gpu/drm/i915/intel_hdmi.c +++ b/drivers/gpu/drm/i915/intel_hdmi.c @@ -802,9 +802,13 @@ static void intel_disable_hdmi(struct intel_encoder *encoder) struct drm_device *dev = encoder->base.dev; struct drm_i915_private *dev_priv = dev->dev_private; struct intel_hdmi *intel_hdmi = enc_to_intel_hdmi(&encoder->base); + struct intel_crtc *crtc = to_intel_crtc(encoder->base.crtc); u32 temp; u32 enable_bits = SDVO_ENABLE | SDVO_AUDIO_ENABLE; + if (crtc->config.has_audio) + intel_audio_codec_disable(encoder); + temp = I915_READ(intel_hdmi->hdmi_reg); /* HW workaround for IBX, we need to move the port to transcoder A |