]> git.karo-electronics.de Git - mv-sheeva.git/commitdiff
drm/i915: DisplayPort hot remove notification to audio driver
authorWu Fengguang <fengguang.wu@intel.com>
Fri, 9 Dec 2011 12:42:21 +0000 (20:42 +0800)
committerKeith Packard <keithp@keithp.com>
Tue, 20 Dec 2011 03:15:48 +0000 (19:15 -0800)
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>
drivers/gpu/drm/i915/intel_dp.c

index 92b041b66e491cbd7775e58458f03fe9b7eee303..db3b461ad4124babfa70f931a584cd433fb788ab 100644 (file)
@@ -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);