From: Paulo Zanoni <przanoni@gmail.com>
To: intel-gfx@lists.freedesktop.org
Cc: Paulo Zanoni <paulo.r.zanoni@intel.com>
Subject: [PATCH 11/19] drm/i915: fix open coded gen5_gt_irq_preinstall
Date: Tue, 1 Apr 2014 15:37:19 -0300 [thread overview]
Message-ID: <1396377447-2177-12-git-send-email-przanoni@gmail.com> (raw)
In-Reply-To: <1396377447-2177-1-git-send-email-przanoni@gmail.com>
From: Paulo Zanoni <paulo.r.zanoni@intel.com>
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>
---
drivers/gpu/drm/i915/i915_irq.c | 10 ++++------
1 file changed, 4 insertions(+), 6 deletions(-)
diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c
index ace3703..5e1a6d3 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)
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;
@@ -2908,7 +2908,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);
}
@@ -2928,7 +2928,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);
@@ -3346,9 +3346,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);
+ gen5_gt_irq_reset(dev);
if (HAS_PCH_NOP(dev))
return;
--
1.8.5.3
next prev parent reply other threads:[~2014-04-01 18:37 UTC|newest]
Thread overview: 29+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-04-01 18:37 [PATCH 00/19] ILK+ interrupt improvements, v3 Paulo Zanoni
2014-04-01 18:37 ` [PATCH 01/19] drm/i915: add GEN5_IRQ_INIT macro Paulo Zanoni
2014-04-01 18:37 ` [PATCH 02/19] drm/i915: also use GEN5_IRQ_INIT with south display interrupts Paulo Zanoni
2014-04-01 18:37 ` [PATCH 03/19] drm/i915: use GEN8_IRQ_INIT on GEN5 Paulo Zanoni
2014-04-01 18:37 ` [PATCH 04/19] drm/i915: add GEN5_IRQ_FINI Paulo Zanoni
2014-04-01 18:37 ` [PATCH 05/19] drm/i915: don't forget to uninstall the PM IRQs Paulo Zanoni
2014-04-01 18:37 ` [PATCH 06/19] drm/i915: properly clear IIR at irq_uninstall on Gen5+ Paulo Zanoni
2014-04-01 18:37 ` [PATCH 07/19] drm/i915: add GEN5_IRQ_INIT Paulo Zanoni
2014-04-01 18:37 ` [PATCH 08/19] drm/i915: check if IIR is still zero at postinstall on Gen5+ Paulo Zanoni
2014-04-01 18:37 ` [PATCH 09/19] drm/i915: fix SERR_INT init/reset code Paulo Zanoni
2014-04-01 18:37 ` [PATCH 10/19] drm/i915: fix GEN7_ERR_INT " Paulo Zanoni
2014-04-01 18:37 ` Paulo Zanoni [this message]
2014-04-01 18:37 ` [PATCH 12/19] drm/i915: extract ibx_irq_uninstall Paulo Zanoni
2014-04-01 18:37 ` [PATCH 13/19] drm/i915: call ibx_irq_uninstall from gen8_irq_uninstall Paulo Zanoni
2014-04-01 18:37 ` [PATCH 14/19] drm/i915: enable SDEIER later Paulo Zanoni
2014-04-01 18:37 ` [PATCH 15/19] drm/i915: remove ibx_irq_uninstall Paulo Zanoni
2014-04-01 18:37 ` [PATCH 16/19] drm/i915: add missing intel_hpd_irq_uninstall Paulo Zanoni
2014-04-01 18:37 ` [PATCH 17/19] drm/i915: add ironlake_irq_reset Paulo Zanoni
2014-04-01 18:37 ` [PATCH 18/19] drm/i915: add gen8_irq_reset Paulo Zanoni
2014-04-01 18:37 ` [PATCH 19/19] drm/i915: only enable HWSTAM interrupts on postinstall on ILK+ Paulo Zanoni
2014-04-01 21:29 ` Daniel Vetter
2014-04-02 11:21 ` Damien Lespiau
2014-04-02 11:23 ` Chris Wilson
2014-04-02 11:27 ` Chris Wilson
2014-04-02 14:14 ` Paulo Zanoni
2014-04-02 15:28 ` Chris Wilson
2014-04-02 16:08 ` Damien Lespiau
2014-04-03 9:31 ` Daniel Vetter
-- strict thread matches above, loose matches on Subject: below --
2014-01-22 19:52 [PATCH 00/19] ILK+ interrupt improvements Paulo Zanoni
2014-01-22 19:52 ` [PATCH 11/19] drm/i915: fix open coded gen5_gt_irq_preinstall 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=1396377447-2177-12-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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.