diff options
| author | Paulo Zanoni <paulo.r.zanoni@intel.com> | 2014-01-20 16:29:10 -0200 |
|---|---|---|
| committer | Paulo Zanoni <paulo.r.zanoni@intel.com> | 2014-03-28 11:44:50 -0300 |
| commit | 39eb51b31223e131cddce6de0f9505378dab679b (patch) | |
| tree | 3e93b2d3ab30ee6c5f2b3abbb04aee9eebff5549 | |
| parent | 865da17e449e4b9c436b8380bccb07c28dd293d4 (diff) | |
drm/i915: remove ibx_irq_uninstall
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).
v2: - Rebase.
Signed-off-by: Paulo Zanoni <paulo.r.zanoni@intel.com>
| -rw-r--r-- | drivers/gpu/drm/i915/i915_irq.c | 23 |
1 files changed, 5 insertions, 18 deletions
diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c index 2b40926a2883..f9abe8f15eef 100644 --- a/drivers/gpu/drm/i915/i915_irq.c +++ b/drivers/gpu/drm/i915/i915_irq.c @@ -2886,7 +2886,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; @@ -2942,7 +2942,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) @@ -2995,7 +2995,7 @@ static void gen8_irq_preinstall(struct drm_device *dev) GEN5_IRQ_RESET(GEN8_DE_MISC_); GEN5_IRQ_RESET(GEN8_PCU_); - ibx_irq_preinstall(dev); + ibx_irq_reset(dev); } static void ibx_hpd_irq_setup(struct drm_device *dev) @@ -3313,19 +3313,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; @@ -3348,7 +3335,7 @@ static void gen8_irq_uninstall(struct drm_device *dev) GEN5_IRQ_RESET(GEN8_DE_MISC_); GEN5_IRQ_RESET(GEN8_PCU_); - ibx_irq_uninstall(dev); + ibx_irq_reset(dev); } static void valleyview_irq_uninstall(struct drm_device *dev) @@ -3399,7 +3386,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) |