aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/i915/i915_irq.c
diff options
context:
space:
mode:
authorDaniel Vetter <daniel.vetter@ffwll.ch>2013-07-04 17:35:30 -0400
committerDaniel Vetter <daniel.vetter@ffwll.ch>2013-07-11 08:37:00 -0400
commitc0d6a3dd61d46a640ead0a9d38b78ca22d37a304 (patch)
tree5ae5c3a01c840d1e83ee422fa0c8823108e00a0a /drivers/gpu/drm/i915/i915_irq.c
parentc7113cc35f59b46b301367b947c4f71ac8f0d5bb (diff)
drm/i915: don't enable PM_VEBOX_CS_ERROR_INTERRUPT
The code to handle it is broken - there's simply no code to clear CS parser errors on gen5+. And behold, for all the other rings we also don't enable it! Leave the handling code itself in place just to be consistent with the existing mess though. And in case someone feels like fixing it all up. This has been errornously enabled in commit 12638c57f31952127c734c26315e1348fa1334c2 Author: Ben Widawsky <ben@bwidawsk.net> Date: Tue May 28 19:22:31 2013 -0700 drm/i915: Enable vebox interrupts Cc: Damien Lespiau <damien.lespiau@intel.com> Cc: Ben Widawsky <ben@bwidawsk.net> Reviewed-by: Ben Widawsky <ben@bwidawsk.net> Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'drivers/gpu/drm/i915/i915_irq.c')
-rw-r--r--drivers/gpu/drm/i915/i915_irq.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c
index f4d5569834c2..cf1a21a9728a 100644
--- a/drivers/gpu/drm/i915/i915_irq.c
+++ b/drivers/gpu/drm/i915/i915_irq.c
@@ -2814,8 +2814,7 @@ static int ivybridge_irq_postinstall(struct drm_device *dev)
2814 2814
2815 I915_WRITE(GEN6_PMIIR, I915_READ(GEN6_PMIIR)); 2815 I915_WRITE(GEN6_PMIIR, I915_READ(GEN6_PMIIR));
2816 if (HAS_VEBOX(dev)) 2816 if (HAS_VEBOX(dev))
2817 pm_irqs |= PM_VEBOX_USER_INTERRUPT | 2817 pm_irqs |= PM_VEBOX_USER_INTERRUPT;
2818 PM_VEBOX_CS_ERROR_INTERRUPT;
2819 2818
2820 /* Our enable/disable rps functions may touch these registers so 2819 /* Our enable/disable rps functions may touch these registers so
2821 * make sure to set a known state for only the non-RPS bits. 2820 * make sure to set a known state for only the non-RPS bits.