diff options
| author | Jani Nikula | 2014-10-27 15:26:49 +0100 |
|---|---|---|
| committer | Daniel Vetter | 2014-11-04 23:22:12 +0100 |
| commit | 2aa0de39fa071129fdd952a0d99828db8434d88f (patch) | |
| tree | 9418e2e5b9d1c8706462f9e00821b6ce7e4c017c /drivers/gpu/drm/i915/intel_audio.c | |
| parent | drm/i915/audio: set ELD Conn_Type at one place (diff) | |
| download | kernel-qcow2-linux-2aa0de39fa071129fdd952a0d99828db8434d88f.tar.gz kernel-qcow2-linux-2aa0de39fa071129fdd952a0d99828db8434d88f.tar.xz kernel-qcow2-linux-2aa0de39fa071129fdd952a0d99828db8434d88f.zip | |
drm/i915/ddi: write ELD where it's supposed to be done
The audio programming sequence states that the ELD must be written and
enabled after the pipe is ready. Indeed, this should clarify the
situation with
commit c79057922ed6c2c6df1214e6ab4414fea1b23db2
Author: Daniel Vetter <daniel.vetter@ffwll.ch>
Date: Wed Apr 16 16:56:09 2014 +0200
drm/i915: Remove vblank wait from haswell_write_eld
and Ville's review of it [1].
Moreover, we should not touch the relevant registers before we get the
audio power domain.
[1] http://mid.gmane.org/20140416155309.GK18465@intel.com
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_audio.c')
| -rw-r--r-- | drivers/gpu/drm/i915/intel_audio.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/gpu/drm/i915/intel_audio.c b/drivers/gpu/drm/i915/intel_audio.c index 537f6d8927f1..158ad60a6e21 100644 --- a/drivers/gpu/drm/i915/intel_audio.c +++ b/drivers/gpu/drm/i915/intel_audio.c @@ -160,8 +160,6 @@ static void haswell_write_eld(struct drm_connector *connector, I915_WRITE(aud_cntrl_st2, tmp); POSTING_READ(aud_cntrl_st2); - assert_pipe_disabled(dev_priv, pipe); - /* Set ELD valid state */ tmp = I915_READ(aud_cntrl_st2); DRM_DEBUG_DRIVER("HDMI audio: pin eld vld status=0x%08x\n", tmp); |