From: Daniel Vetter <daniel@ffwll.ch>
To: Paulo Zanoni <przanoni@gmail.com>
Cc: intel-gfx@lists.freedesktop.org, Paulo Zanoni <paulo.r.zanoni@intel.com>
Subject: Re: [PATCH 19/19] drm/i915: only enable HWSTAM interrupts on postinstall on ILK+
Date: Tue, 1 Apr 2014 23:29:40 +0200 [thread overview]
Message-ID: <20140401212940.GE7225@phenom.ffwll.local> (raw)
In-Reply-To: <1396377447-2177-20-git-send-email-przanoni@gmail.com>
On Tue, Apr 01, 2014 at 03:37:27PM -0300, Paulo Zanoni wrote:
> From: Paulo Zanoni <paulo.r.zanoni@intel.com>
>
> We should only enable interrupts at postinstall.
>
> And now on ILK/SNB/IVB/HSW the irq_preinstall and irq_postinstall
> functions leave the hardware in the same state.
>
> 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 fd1ef09..75f1997 100644
> --- a/drivers/gpu/drm/i915/i915_irq.c
> +++ b/drivers/gpu/drm/i915/i915_irq.c
> @@ -2912,6 +2912,8 @@ static void ironlake_irq_reset(struct drm_device *dev)
> {
> struct drm_i915_private *dev_priv = dev->dev_private;
>
> + I915_WRITE(HWSTAM, 0xffffffff);
> +
> GEN5_IRQ_RESET(DE);
> if (IS_GEN7(dev))
> I915_WRITE(GEN7_ERR_INT, 0xffffffff);
> @@ -2923,10 +2925,6 @@ static void ironlake_irq_reset(struct drm_device *dev)
>
> static void ironlake_irq_preinstall(struct drm_device *dev)
> {
> - drm_i915_private_t *dev_priv = (drm_i915_private_t *) dev->dev_private;
> -
> - I915_WRITE(HWSTAM, 0xeffe);
> -
> ironlake_irq_reset(dev);
> }
Follow-up patch to remove this wrapper functions and just put
foo_irq_reset into the preinstall hooks?
In any case entire series merged (with one tiny rebase conflict since
drm_i915_private_t is now gone).
-Daniel
>
> @@ -3099,6 +3097,8 @@ static int ironlake_irq_postinstall(struct drm_device *dev)
>
> dev_priv->irq_mask = ~display_mask;
>
> + I915_WRITE(HWSTAM, 0xeffe);
> +
> ibx_irq_pre_postinstall(dev);
>
> GEN5_IRQ_INIT(DE, dev_priv->irq_mask, display_mask | extra_mask);
> @@ -3354,8 +3354,6 @@ static void ironlake_irq_uninstall(struct drm_device *dev)
>
> intel_hpd_irq_uninstall(dev_priv);
>
> - I915_WRITE(HWSTAM, 0xffffffff);
> -
> ironlake_irq_reset(dev);
> }
>
> --
> 1.8.5.3
>
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/intel-gfx
--
Daniel Vetter
Software Engineer, Intel Corporation
+41 (0) 79 365 57 48 - http://blog.ffwll.ch
next prev parent reply other threads:[~2014-04-01 21:29 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 ` [PATCH 11/19] drm/i915: fix open coded gen5_gt_irq_preinstall Paulo Zanoni
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 [this message]
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 19/19] drm/i915: only enable HWSTAM interrupts on postinstall on ILK+ 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=20140401212940.GE7225@phenom.ffwll.local \
--to=daniel@ffwll.ch \
--cc=intel-gfx@lists.freedesktop.org \
--cc=paulo.r.zanoni@intel.com \
--cc=przanoni@gmail.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