aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/i915/i915_irq.c
diff options
context:
space:
mode:
authorPaulo Zanoni <paulo.r.zanoni@intel.com>2014-04-01 14:37:19 -0400
committerDaniel Vetter <daniel.vetter@ffwll.ch>2014-04-01 17:10:35 -0400
commit7c4d664e03c9b12572356a6ce8e69c7d59e6f4f7 (patch)
tree56c5797d834d332c7cabe63719aa32eb6763771d /drivers/gpu/drm/i915/i915_irq.c
parentc6d954c173b65c8c3b2fedba2bb9c9e349bbcdd6 (diff)
drm/i915: fix open coded gen5_gt_irq_preinstall
The duplicate was at an _uninstall function, so rename it to gen5_gt_irq_reset. v2: - Rebase. Signed-off-by: Paulo Zanoni <paulo.r.zanoni@intel.com> 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.c10
1 files changed, 4 insertions, 6 deletions
diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c
index ace370323a28..5e1a6d330c8c 100644
--- a/drivers/gpu/drm/i915/i915_irq.c
+++ b/drivers/gpu/drm/i915/i915_irq.c
@@ -2886,7 +2886,7 @@ static void ibx_irq_preinstall(struct drm_device *dev)
2886 POSTING_READ(SDEIER); 2886 POSTING_READ(SDEIER);
2887} 2887}
2888 2888
2889static void gen5_gt_irq_preinstall(struct drm_device *dev) 2889static void gen5_gt_irq_reset(struct drm_device *dev)
2890{ 2890{
2891 struct drm_i915_private *dev_priv = dev->dev_private; 2891 struct drm_i915_private *dev_priv = dev->dev_private;
2892 2892
@@ -2908,7 +2908,7 @@ static void ironlake_irq_preinstall(struct drm_device *dev)
2908 if (IS_GEN7(dev)) 2908 if (IS_GEN7(dev))
2909 I915_WRITE(GEN7_ERR_INT, 0xffffffff); 2909 I915_WRITE(GEN7_ERR_INT, 0xffffffff);
2910 2910
2911 gen5_gt_irq_preinstall(dev); 2911 gen5_gt_irq_reset(dev);
2912 2912
2913 ibx_irq_preinstall(dev); 2913 ibx_irq_preinstall(dev);
2914} 2914}
@@ -2928,7 +2928,7 @@ static void valleyview_irq_preinstall(struct drm_device *dev)
2928 I915_WRITE(GTIIR, I915_READ(GTIIR)); 2928 I915_WRITE(GTIIR, I915_READ(GTIIR));
2929 I915_WRITE(GTIIR, I915_READ(GTIIR)); 2929 I915_WRITE(GTIIR, I915_READ(GTIIR));
2930 2930
2931 gen5_gt_irq_preinstall(dev); 2931 gen5_gt_irq_reset(dev);
2932 2932
2933 I915_WRITE(DPINVGTT, 0xff); 2933 I915_WRITE(DPINVGTT, 0xff);
2934 2934
@@ -3346,9 +3346,7 @@ static void ironlake_irq_uninstall(struct drm_device *dev)
3346 if (IS_GEN7(dev)) 3346 if (IS_GEN7(dev))
3347 I915_WRITE(GEN7_ERR_INT, 0xffffffff); 3347 I915_WRITE(GEN7_ERR_INT, 0xffffffff);
3348 3348
3349 GEN5_IRQ_RESET(GT); 3349 gen5_gt_irq_reset(dev);
3350 if (INTEL_INFO(dev)->gen >= 6)
3351 GEN5_IRQ_RESET(GEN6_PM);
3352 3350
3353 if (HAS_PCH_NOP(dev)) 3351 if (HAS_PCH_NOP(dev))
3354 return; 3352 return;