From: Paulo Zanoni <przanoni@gmail.com>
To: intel-gfx@lists.freedesktop.org
Cc: Paulo Zanoni <paulo.r.zanoni@intel.com>
Subject: [PATCH 15/19] drm/i915: remove ibx_irq_uninstall
Date: Wed, 22 Jan 2014 17:52:33 -0200 [thread overview]
Message-ID: <1390420357-23669-16-git-send-email-przanoni@gmail.com> (raw)
In-Reply-To: <1390420357-23669-1-git-send-email-przanoni@gmail.com>
From: Paulo Zanoni <paulo.r.zanoni@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.zanoni@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 ce6a8f3..5d8d262 100644
--- a/drivers/gpu/drm/i915/i915_irq.c
+++ b/drivers/gpu/drm/i915/i915_irq.c
@@ -2635,7 +2635,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;
@@ -2692,7 +2692,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)
@@ -2746,7 +2746,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)
@@ -3006,19 +3006,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;
@@ -3043,7 +3030,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)
@@ -3087,7 +3074,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.4.2
next prev parent reply other threads:[~2014-01-22 19:53 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-01-22 19:52 [PATCH 00/19] ILK+ interrupt improvements Paulo Zanoni
2014-01-22 19:52 ` [PATCH 01/19] drm/i915: add GEN5_IRQ_INIT macro Paulo Zanoni
2014-01-22 19:52 ` [PATCH 02/19] drm/i915: also use GEN5_IRQ_INIT with south display interrupts Paulo Zanoni
2014-01-22 19:52 ` [PATCH 03/19] drm/i915: use GEN8_IRQ_INIT on GEN5 Paulo Zanoni
2014-01-22 19:52 ` [PATCH 04/19] drm/i915: add GEN5_IRQ_FINI Paulo Zanoni
2014-01-22 19:52 ` [PATCH 05/19] drm/i915: don't forget to uninstall the PM IRQs Paulo Zanoni
2014-01-22 19:52 ` [PATCH 06/19] drm/i915: properly clear IIR at irq_uninstall on Gen5+ Paulo Zanoni
2014-01-22 19:52 ` [PATCH 07/19] drm/i915: add GEN5_IRQ_INIT Paulo Zanoni
2014-01-22 19:52 ` [PATCH 08/19] drm/i915: check if IIR is still zero at postinstall on Gen5+ Paulo Zanoni
2014-01-22 19:52 ` [PATCH 09/19] drm/i915: fix SERR_INT init/reset code Paulo Zanoni
2014-01-22 19:52 ` [PATCH 10/19] drm/i915: fix GEN7_ERR_INT " Paulo Zanoni
2014-01-22 19:52 ` [PATCH 11/19] drm/i915: fix open coded gen5_gt_irq_preinstall Paulo Zanoni
2014-01-22 19:52 ` [PATCH 12/19] drm/i915: extract ibx_irq_uninstall Paulo Zanoni
2014-01-22 19:52 ` [PATCH 13/19] drm/i915: call ibx_irq_uninstall from gen8_irq_uninstall Paulo Zanoni
2014-01-22 19:52 ` [PATCH 14/19] drm/i915: enable SDEIER later Paulo Zanoni
2014-01-22 19:52 ` Paulo Zanoni [this message]
2014-01-22 19:52 ` [PATCH 16/19] drm/i915: add missing intel_hpd_irq_uninstall Paulo Zanoni
2014-01-22 19:52 ` [PATCH 17/19] drm/i915: add ironlake_irq_reset Paulo Zanoni
2014-01-22 19:52 ` [PATCH 18/19] drm/i915: add gen8_irq_reset Paulo Zanoni
2014-01-22 19:52 ` [PATCH 19/19] drm/i915: only enable HWSTAM interrupts on postinstall on ILK+ Paulo Zanoni
2014-01-22 21:08 ` [PATCH 00/19] ILK+ interrupt improvements Daniel Vetter
2014-01-23 6:07 ` Jani Nikula
2014-01-23 8:22 ` Daniel Vetter
2014-01-29 20:08 ` [PATCH 20/19] drm/i915: add POSTING_READs to the IRQ init/reset macros Paulo Zanoni
-- strict thread matches above, loose matches on Subject: below --
2014-04-01 18:37 [PATCH 00/19] ILK+ interrupt improvements, v3 Paulo Zanoni
2014-04-01 18:37 ` [PATCH 15/19] drm/i915: remove ibx_irq_uninstall Paulo Zanoni
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1390420357-23669-16-git-send-email-przanoni@gmail.com \
--to=przanoni@gmail.com \
--cc=intel-gfx@lists.freedesktop.org \
--cc=paulo.r.zanoni@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox