From: Paulo Zanoni <paulo.r.zan...@intel.com>
After the latest changes, ibx_irq_preinstall and ibx_irq_uninstall are
the same, so remove one of the copies and rename the other to
ibx_irq_reset (since we're using the "reset" name for things which are
called both at preinstall and uninstall).
Signed-off-by: Paulo Zanoni <paulo.r.zan...@intel.com>
---
drivers/gpu/drm/i915/i915_irq.c | 23 +++++------------------
1 file changed, 5 insertions(+), 18 deletions(-)
diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c
index 4479e29..3584a16d 100644
--- a/drivers/gpu/drm/i915/i915_irq.c
+++ b/drivers/gpu/drm/i915/i915_irq.c
@@ -2803,7 +2803,7 @@ void i915_queue_hangcheck(struct drm_device *dev)
round_jiffies_up(jiffies + DRM_I915_HANGCHECK_JIFFIES));
}
-static void ibx_irq_preinstall(struct drm_device *dev)
+static void ibx_irq_reset(struct drm_device *dev)
{
struct drm_i915_private *dev_priv = dev->dev_private;
@@ -2860,7 +2860,7 @@ static void ironlake_irq_preinstall(struct drm_device
*dev)
gen5_gt_irq_reset(dev);
- ibx_irq_preinstall(dev);
+ ibx_irq_reset(dev);
}
static void valleyview_irq_preinstall(struct drm_device *dev)
@@ -2914,7 +2914,7 @@ static void gen8_irq_preinstall(struct drm_device *dev)
GEN5_IRQ_RESET(GEN8_PCU_);
POSTING_READ(GEN8_PCU_IIR);
- ibx_irq_preinstall(dev);
+ ibx_irq_reset(dev);
}
static void ibx_hpd_irq_setup(struct drm_device *dev)
@@ -3243,19 +3243,6 @@ static int gen8_irq_postinstall(struct drm_device *dev)
return 0;
}
-static void ibx_irq_uninstall(struct drm_device *dev)
-{
- struct drm_i915_private *dev_priv = dev->dev_private;
-
- if (HAS_PCH_NOP(dev))
- return;
-
- GEN5_IRQ_RESET(SDE);
-
- if (HAS_PCH_CPT(dev) || HAS_PCH_LPT(dev))
- I915_WRITE(SERR_INT, 0xffffffff);
-}
-
static void gen8_irq_uninstall(struct drm_device *dev)
{
struct drm_i915_private *dev_priv = dev->dev_private;
@@ -3280,7 +3267,7 @@ static void gen8_irq_uninstall(struct drm_device *dev)
POSTING_READ(GEN8_PCU_IIR);
- ibx_irq_uninstall(dev);
+ ibx_irq_reset(dev);
}
static void valleyview_irq_uninstall(struct drm_device *dev)
@@ -3331,7 +3318,7 @@ static void ironlake_irq_uninstall(struct drm_device *dev)
gen5_gt_irq_reset(dev);
- ibx_irq_uninstall(dev);
+ ibx_irq_reset(dev);
}
static void i8xx_irq_preinstall(struct drm_device * dev)
--
1.8.5.3
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
