aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorWu Fengguang <fengguang.wu@intel.com>2011-12-09 20:42:21 +0800
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-02-13 11:06:08 -0800
commit1f8991ccf771442ae2423971798a6ca9d6db6343 (patch)
tree22586ea13c8da884843c307b6192de3a5ca059da /drivers
parent032aa01c0b53e12b3ac46db8e7202a3230a83a89 (diff)
downloadkernel_samsung_smdk4412-1f8991ccf771442ae2423971798a6ca9d6db6343.zip
kernel_samsung_smdk4412-1f8991ccf771442ae2423971798a6ca9d6db6343.tar.gz
kernel_samsung_smdk4412-1f8991ccf771442ae2423971798a6ca9d6db6343.tar.bz2
drm/i915: DisplayPort hot remove notification to audio driver
commit 832afda6a7d7235ef0e09f4ec46736861540da6d upstream. On DP monitor hot remove, clear DP_AUDIO_OUTPUT_ENABLE accordingly, so that the audio driver will receive hot plug events and take action to refresh its device state and ELD contents. Note that the DP_AUDIO_OUTPUT_ENABLE bit may be enabled or disabled only when the link training is complete and set to "Normal". Tested OK for both hot plug/remove and DPMS on/off. Signed-off-by: Wu Fengguang <fengguang.wu@intel.com> Signed-off-by: Keith Packard <keithp@keithp.com> Signed-off-by: Eugeni Dodonov <eugeni.dodonov@intel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/gpu/drm/i915/intel_dp.c1
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 14264a8..bf9fea9 100644
--- a/drivers/gpu/drm/i915/intel_dp.c
+++ b/drivers/gpu/drm/i915/intel_dp.c
@@ -1554,6 +1554,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);
}