Commit 3bcedbe5 authored by Jesse Barnes's avatar Jesse Barnes Committed by Daniel Vetter

drm/i915: limit VLV IRQ enables to those we use

To match IVB.
Signed-off-by: default avatarJesse Barnes <jbarnes@virtuousgeek.org>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent da131a46
...@@ -1957,6 +1957,7 @@ static int valleyview_irq_postinstall(struct drm_device *dev) ...@@ -1957,6 +1957,7 @@ static int valleyview_irq_postinstall(struct drm_device *dev)
u32 enable_mask; u32 enable_mask;
u32 hotplug_en = I915_READ(PORT_HOTPLUG_EN); u32 hotplug_en = I915_READ(PORT_HOTPLUG_EN);
u32 pipestat_enable = PLANE_FLIP_DONE_INT_EN_VLV; u32 pipestat_enable = PLANE_FLIP_DONE_INT_EN_VLV;
u32 render_irqs;
u16 msid; u16 msid;
enable_mask = I915_DISPLAY_PORT_INTERRUPT; enable_mask = I915_DISPLAY_PORT_INTERRUPT;
...@@ -1996,21 +1997,12 @@ static int valleyview_irq_postinstall(struct drm_device *dev) ...@@ -1996,21 +1997,12 @@ static int valleyview_irq_postinstall(struct drm_device *dev)
I915_WRITE(VLV_IIR, 0xffffffff); I915_WRITE(VLV_IIR, 0xffffffff);
I915_WRITE(VLV_IIR, 0xffffffff); I915_WRITE(VLV_IIR, 0xffffffff);
dev_priv->gt_irq_mask = ~0;
I915_WRITE(GTIIR, I915_READ(GTIIR));
I915_WRITE(GTIIR, I915_READ(GTIIR)); I915_WRITE(GTIIR, I915_READ(GTIIR));
I915_WRITE(GTIMR, dev_priv->gt_irq_mask); I915_WRITE(GTIMR, dev_priv->gt_irq_mask);
I915_WRITE(GTIER, GT_GEN6_BLT_FLUSHDW_NOTIFY_INTERRUPT |
GT_GEN6_BLT_CS_ERROR_INTERRUPT | render_irqs = GT_USER_INTERRUPT | GEN6_BSD_USER_INTERRUPT |
GT_GEN6_BLT_USER_INTERRUPT | GEN6_BLITTER_USER_INTERRUPT;
GT_GEN6_BSD_USER_INTERRUPT | I915_WRITE(GTIER, render_irqs);
GT_GEN6_BSD_CS_ERROR_INTERRUPT |
GT_GEN7_L3_PARITY_ERROR_INTERRUPT |
GT_PIPE_NOTIFY |
GT_RENDER_CS_ERROR_INTERRUPT |
GT_SYNC_STATUS |
GT_USER_INTERRUPT);
POSTING_READ(GTIER); POSTING_READ(GTIER);
/* ack & enable invalid PTE error interrupts */ /* ack & enable invalid PTE error interrupts */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment