diff options
| author | Jani Nikula <jani.nikula@intel.com> | 2014-11-18 12:11:29 +0200 |
|---|---|---|
| committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2014-11-18 11:17:37 +0100 |
| commit | eb45fa0b93e03b03848cd048dcc57648409c8125 (patch) | |
| tree | e41f2ecc3bf3f72c8b3e30be2a1ee44170324daa /drivers/gpu/drm/i915/intel_audio.c | |
| parent | cbc572a9a5a90aac54ff1a5c7356b6f6bda78264 (diff) | |
| download | op-kernel-dev-eb45fa0b93e03b03848cd048dcc57648409c8125.zip op-kernel-dev-eb45fa0b93e03b03848cd048dcc57648409c8125.tar.gz | |
drm/i915/audio: fix monitor presence indication after disable
Indicate the monitor has been disconnected on disable.
The regression has been introduced in
commit 5fad84a7530f8e7664cdc6f490cb90653fed1266
Author: Jani Nikula <jani.nikula@intel.com>
Date: Tue Nov 4 10:30:23 2014 +0200
drm/i915: rewrite hsw/bdw audio codec enable/disable sequences
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=86424
Cc: Rodrigo Vivi <rodrigo.vivi@gmail.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'drivers/gpu/drm/i915/intel_audio.c')
| -rw-r--r-- | drivers/gpu/drm/i915/intel_audio.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/gpu/drm/i915/intel_audio.c b/drivers/gpu/drm/i915/intel_audio.c index 87750ef..2c7ed5c 100644 --- a/drivers/gpu/drm/i915/intel_audio.c +++ b/drivers/gpu/drm/i915/intel_audio.c @@ -194,6 +194,7 @@ static void hsw_audio_codec_disable(struct intel_encoder *encoder) /* Invalidate ELD */ tmp = I915_READ(HSW_AUD_PIN_ELD_CP_VLD); tmp &= ~AUDIO_ELD_VALID(pipe); + tmp &= ~AUDIO_OUTPUT_ENABLE(pipe); I915_WRITE(HSW_AUD_PIN_ELD_CP_VLD, tmp); } |
