diff options
| author | Dave Airlie <airlied@redhat.com> | 2012-01-03 09:34:43 +0000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2012-01-03 09:34:43 +0000 |
| commit | 2318fcd65c1fb1e842f860c1e3fe4dba7e55cd11 (patch) | |
| tree | 8f2d73ee6f8be3f49ee07881a8579fa15f9e1881 /drivers/gpu/drm/i915/intel_dp.c | |
| parent | f9f23a77f07506a32d9dc1d925bf85c0e7507b66 (diff) | |
| parent | 097354eb14fa94d31a09c64d640643f58e4a5a9a (diff) | |
Merge branch 'drm-intel-next' of git://people.freedesktop.org/~keithp/linux into drm-core-next
* 'drm-intel-next' of git://people.freedesktop.org/~keithp/linux:
drm/i915: check ACTHD of all rings
drm/i915: DisplayPort hot remove notification to audio driver
drm/i915: HDMI hot remove notification to audio driver
drm/i915: dont trigger hotplug events on unchanged ELD
drm/i915: rename audio ELD registers
drm/i915: fix ELD writing for SandyBridge
Diffstat (limited to 'drivers/gpu/drm/i915/intel_dp.c')
| -rw-r--r-- | drivers/gpu/drm/i915/intel_dp.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c index 92b041b66e4..db3b461ad41 100644 --- a/drivers/gpu/drm/i915/intel_dp.c +++ b/drivers/gpu/drm/i915/intel_dp.c @@ -1926,6 +1926,7 @@ intel_dp_link_down(struct intel_dp *intel_dp) intel_wait_for_vblank(dev, to_intel_crtc(crtc)->pipe); } + DP &= ~DP_AUDIO_OUTPUT_ENABLE; I915_WRITE(intel_dp->output_reg, DP & ~DP_PORT_EN); POSTING_READ(intel_dp->output_reg); msleep(intel_dp->panel_power_down_delay); |