diff options
author | Daniel Vetter <daniel.vetter@ffwll.ch> | 2013-11-07 05:05:43 -0500 |
---|---|---|
committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2013-11-08 12:10:12 -0500 |
commit | 92d03a80489fbf0a35827b8b11b0a78703e34425 (patch) | |
tree | f3d65014afb5ea1e9f59b9740bd560df2211833c /drivers/gpu | |
parent | 6d766f022a57446b3ccbaabfa2676bb979fb7c2f (diff) |
drm/i915: Wire up PCH interrupts for bdw
Gives us hotplug, gmbus, dp aux and south errors (underrun
reporting!).
Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Acked-by: Ben Widawsky <ben@bwidawsk.net>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'drivers/gpu')
-rw-r--r-- | drivers/gpu/drm/i915/i915_irq.c | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c index 9304ce3e4649..44209442ff1a 100644 --- a/drivers/gpu/drm/i915/i915_irq.c +++ b/drivers/gpu/drm/i915/i915_irq.c | |||
@@ -1821,6 +1821,22 @@ static irqreturn_t gen8_irq_handler(int irq, void *arg) | |||
1821 | DRM_ERROR("The master control interrupt lied (DE PIPE)!\n"); | 1821 | DRM_ERROR("The master control interrupt lied (DE PIPE)!\n"); |
1822 | } | 1822 | } |
1823 | 1823 | ||
1824 | if (!HAS_PCH_NOP(dev) && master_ctl & GEN8_DE_PCH_IRQ) { | ||
1825 | /* | ||
1826 | * FIXME(BDW): Assume for now that the new interrupt handling | ||
1827 | * scheme also closed the SDE interrupt handling race we've seen | ||
1828 | * on older pch-split platforms. But this needs testing. | ||
1829 | */ | ||
1830 | u32 pch_iir = I915_READ(SDEIIR); | ||
1831 | |||
1832 | cpt_irq_handler(dev, pch_iir); | ||
1833 | |||
1834 | if (pch_iir) { | ||
1835 | I915_WRITE(SDEIIR, pch_iir); | ||
1836 | ret = IRQ_HANDLED; | ||
1837 | } | ||
1838 | } | ||
1839 | |||
1824 | I915_WRITE(GEN8_MASTER_IRQ, GEN8_MASTER_IRQ_CONTROL); | 1840 | I915_WRITE(GEN8_MASTER_IRQ, GEN8_MASTER_IRQ_CONTROL); |
1825 | POSTING_READ(GEN8_MASTER_IRQ); | 1841 | POSTING_READ(GEN8_MASTER_IRQ); |
1826 | 1842 | ||