diff options
| author | Dave Airlie | 2014-06-18 03:29:35 +0200 |
|---|---|---|
| committer | Daniel Vetter | 2014-07-07 15:08:51 +0200 |
| commit | 13cf550448b58abf8f44f5d6a560f2d20871c965 (patch) | |
| tree | 6681d87ef2510b812c30968d9cc4473feba05884 /drivers/gpu/drm/i915/intel_ddi.c | |
| parent | drm/i915: gmch: fix stuck primary plane due to memory self-refresh mode (diff) | |
| download | kernel-qcow2-linux-13cf550448b58abf8f44f5d6a560f2d20871c965.tar.gz kernel-qcow2-linux-13cf550448b58abf8f44f5d6a560f2d20871c965.tar.xz kernel-qcow2-linux-13cf550448b58abf8f44f5d6a560f2d20871c965.zip | |
drm/i915: rework digital port IRQ handling (v2)
The digital ports from Ironlake and up have the ability to distinguish
between long and short HPD pulses. Displayport 1.1 only uses the short
form to request link retraining usually, so we haven't really needed
support for it until now.
However with DP 1.2 MST we need to handle the short irqs on their
own outside the modesetting locking the long hpd's involve. This
patch adds the framework to distinguish between short/long to the
current code base, to lay the basis for future DP 1.2 MST work.
This should mean we get better bisectability in case of regression
due to the new irq handling.
v2: add GM45 support (untested, due to lack of hw)
Signed-off-by: Dave Airlie <airlied@redhat.com>
Reviewed-by: Todd Previte <tprevite@gmail.com>
[danvet: Fix conflicts in i915_irq.c with Oscar Mateo's irq handling
race fixes and a trivial one in intel_drv.h with the psr code.]
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'drivers/gpu/drm/i915/intel_ddi.c')
| -rw-r--r-- | drivers/gpu/drm/i915/intel_ddi.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/gpu/drm/i915/intel_ddi.c b/drivers/gpu/drm/i915/intel_ddi.c index ded60139820e..efaf44b5ff25 100644 --- a/drivers/gpu/drm/i915/intel_ddi.c +++ b/drivers/gpu/drm/i915/intel_ddi.c @@ -1705,6 +1705,9 @@ void intel_ddi_init(struct drm_device *dev, enum port port) intel_encoder->cloneable = 0; intel_encoder->hot_plug = intel_ddi_hot_plug; + intel_dig_port->hpd_pulse = intel_dp_hpd_pulse; + dev_priv->hpd_irq_port[port] = intel_dig_port; + if (init_dp) dp_connector = intel_ddi_init_dp_connector(intel_dig_port); |