From: Paulo Zanoni <paulo.r.zan...@intel.com>
The duplicate was at an _uninstall function, so rename it to
gen5_gt_irq_reset.
Signed-off-by: Paulo Zanoni <paulo.r.zan...@intel.com>
---
drivers/gpu/drm/i915/i915_irq.c | 11 ++++-------
1 file changed, 4 insertions(+), 7 deletions(-)
diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c
index 02eb493..b162ddd 100644
--- a/drivers/gpu/drm/i915/i915_irq.c
+++ b/drivers/gpu/drm/i915/i915_irq.c
@@ -2825,7 +2825,7 @@ static void ibx_irq_preinstall(struct drm_device *dev)
POSTING_READ(SDEIER);
}
-static void gen5_gt_irq_preinstall(struct drm_device *dev)
+static void gen5_gt_irq_reset(struct drm_device *dev)
{
struct drm_i915_private *dev_priv = dev->dev_private;
@@ -2848,7 +2848,7 @@ static void ironlake_irq_preinstall(struct drm_device
*dev)
if (IS_GEN7(dev))
I915_WRITE(GEN7_ERR_INT, 0xffffffff);
- gen5_gt_irq_preinstall(dev);
+ gen5_gt_irq_reset(dev);
ibx_irq_preinstall(dev);
}
@@ -2868,7 +2868,7 @@ static void valleyview_irq_preinstall(struct drm_device
*dev)
I915_WRITE(GTIIR, I915_READ(GTIIR));
I915_WRITE(GTIIR, I915_READ(GTIIR));
- gen5_gt_irq_preinstall(dev);
+ gen5_gt_irq_reset(dev);
I915_WRITE(DPINVGTT, 0xff);
@@ -3300,10 +3300,7 @@ static void ironlake_irq_uninstall(struct drm_device
*dev)
if (IS_GEN7(dev))
I915_WRITE(GEN7_ERR_INT, 0xffffffff);
- GEN5_IRQ_RESET(GT);
- if (INTEL_INFO(dev)->gen >= 6)
- GEN5_IRQ_RESET(GEN6_PM);
- POSTING_READ(GTIIR);
+ gen5_gt_irq_reset(dev);
if (HAS_PCH_NOP(dev))
return;
--
1.8.5.3
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
