summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaulo Zanoni <paulo.r.zanoni@intel.com>2013-07-09 15:57:57 -0300
committerPaulo Zanoni <paulo.r.zanoni@intel.com>2013-07-15 11:55:33 -0300
commitaee5136145275b06e855eebb109cfbd4375a843c (patch)
tree2639dd4328b3eceb5158c2cff5562571e90c7a0e
parent8edd7e10e38e52c5a8b14ca4713fd3bef455ad70 (diff)
drm/i915: remove extra clearing of GTIIR from VLV irq preinstall
After the last changes, gen5_gt_irq_reset should now guarantee that GTIIR will be zero. Also, at valleyview_irq_postinstall we call gen5_gt_irq_postinstall which calls intel_irq_reg_init, which will print a nice WARN in case GTIIR is not zero. Signed-off-by: Paulo Zanoni <paulo.r.zanoni@intel.com>
-rw-r--r--drivers/gpu/drm/i915/i915_irq.c4
1 files changed, 0 insertions, 4 deletions
diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c
index 06ebb9f1a035..b4d68715d0e4 100644
--- a/drivers/gpu/drm/i915/i915_irq.c
+++ b/drivers/gpu/drm/i915/i915_irq.c
@@ -2088,10 +2088,6 @@ static void valleyview_irq_preinstall(struct drm_device *dev)
I915_WRITE(RING_IMR(GEN6_BSD_RING_BASE), 0);
I915_WRITE(RING_IMR(BLT_RING_BASE), 0);
- /* and GT */
- I915_WRITE(GTIIR, I915_READ(GTIIR));
- I915_WRITE(GTIIR, I915_READ(GTIIR));
-
gen5_gt_irq_reset(dev);
I915_WRITE(DPINVGTT, 0xff);