From: Chris Wilson <chris@chris-wilson.co.uk>
To: Jesse Barnes <jbarnes@virtuousgeek.org>
Cc: intel-gfx@lists.freedesktop.org
Subject: Re: [PATCH 11/12] drm/i915: Inline I915_INTERRUPT_ENABLE_FIX
Date: Wed, 25 Apr 2012 22:28:21 +0100 [thread overview]
Message-ID: <1335389337_51165@CP5-2952> (raw)
In-Reply-To: <20120425135512.6307b991@jbarnes-desktop>
On Wed, 25 Apr 2012 13:55:12 -0700, Jesse Barnes <jbarnes@virtuousgeek.org> wrote:
> On Tue, 24 Apr 2012 22:59:51 +0100
> Chris Wilson <chris@chris-wilson.co.uk> wrote:
> > + dev_priv->irq_mask = ~(I915_ASLE_INTERRUPT |
> > + I915_DISPLAY_PIPE_A_EVENT_INTERRUPT |
> > + I915_DISPLAY_PIPE_B_EVENT_INTERRUPT |
> > + I915_DISPLAY_PLANE_A_FLIP_PENDING_INTERRUPT |
> > + I915_DISPLAY_PLANE_B_FLIP_PENDING_INTERRUPT |
> > + I915_RENDER_COMMAND_PARSER_ERROR_INTERRUPT);
> > +
> > + enable_mask = (I915_ASLE_INTERRUPT |
> > + I915_DISPLAY_PIPE_A_EVENT_INTERRUPT |
> > + I915_DISPLAY_PIPE_B_EVENT_INTERRUPT |
> > + I915_DISPLAY_PLANE_A_FLIP_PENDING_INTERRUPT |
> > + I915_DISPLAY_PLANE_B_FLIP_PENDING_INTERRUPT |
> > + I915_RENDER_COMMAND_PARSER_ERROR_INTERRUPT |
> > + I915_USER_INTERRUPT);
>
> You could set the enable mask to ~irq_mask | I915_USER_INTERRUPT I
> think just to save a little duplication? No biggie though.
I considered reducing the duplication, but having just done i8xx/i915
where the relationship between irq_mask and enable_mask was a little
more complicated, I erred on the side of verbosity.
enable_mask = ~dev_priv->irq_mask;
enable_mask |= I915_USER_INTERRUPT;
if (IS_G4X(dev))
enable_mask |= I915_BSD_USER_INTERRUPT;
Works for me as well.
-Chris
--
Chris Wilson, Intel Open Source Technology Centre
next prev parent reply other threads:[~2012-04-25 21:29 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-04-24 21:59 [PATCH 01/12] drm/i915: Unconditionally initialise the interrupt workers Chris Wilson
2012-04-24 21:59 ` [PATCH 02/12] drm/i915: Remove redundant initialisation of per-ring IRQ waitqueues Chris Wilson
2012-04-24 21:59 ` [PATCH 03/12] drm/i915: pending_flip_is_done is gen3, name it so Chris Wilson
2012-04-24 21:59 ` [PATCH 04/12] drm/i915: Duplicate and split the gen3/4 irq handler Chris Wilson
2012-04-24 21:59 ` [PATCH 05/12] drm/i915: Clear FlipDone semantics change for pageflipping on gen3 Chris Wilson
2012-04-25 20:48 ` Jesse Barnes
2012-04-24 21:59 ` [PATCH 06/12] drm/i915: Remove gen3 irq code from gen4 irq routine Chris Wilson
2012-04-25 20:49 ` Jesse Barnes
2012-04-24 21:59 ` [PATCH 07/12] drm/i915: Remove gen4 irq code from gen3 " Chris Wilson
2012-04-25 20:50 ` Jesse Barnes
2012-04-24 21:59 ` [PATCH 08/12] drm/i915: HWSTAM is only 16-bit on gen3 Chris Wilson
2012-04-25 20:50 ` Jesse Barnes
2012-04-24 21:59 ` [PATCH 09/12] drm/i915: Cleanup gen3 irq uninstall Chris Wilson
2012-04-25 20:51 ` Jesse Barnes
2012-04-24 21:59 ` [PATCH 10/12] drm/i915: Handle PendingFlip on gen3 robustly Chris Wilson
2012-04-25 20:52 ` Jesse Barnes
2012-04-24 21:59 ` [PATCH 11/12] drm/i915: Inline I915_INTERRUPT_ENABLE_FIX Chris Wilson
2012-04-25 20:55 ` Jesse Barnes
2012-04-25 21:28 ` Chris Wilson [this message]
2012-04-24 21:59 ` [PATCH 12/12] drm/i915: Remove unused and unloved vblank macros Chris Wilson
2012-04-25 20:55 ` Jesse Barnes
2012-04-26 20:58 ` Daniel Vetter
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=1335389337_51165@CP5-2952 \
--to=chris@chris-wilson.co.uk \
--cc=intel-gfx@lists.freedesktop.org \
--cc=jbarnes@virtuousgeek.org \
/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