From: "Ville Syrjälä" <ville.syrjala@linux.intel.com>
To: Damien Lespiau <damien.lespiau@intel.com>
Cc: intel-gfx@lists.freedesktop.org
Subject: Re: [PATCH] drm/i915: Rename GEN8_PIPE_FLIP_DONE to PRIMARY_FLIP_DONE
Date: Tue, 8 Apr 2014 13:31:34 +0300 [thread overview]
Message-ID: <20140408103134.GF4481@intel.com> (raw)
In-Reply-To: <1396916564-31557-1-git-send-email-damien.lespiau@intel.com>
On Tue, Apr 08, 2014 at 01:22:44AM +0100, Damien Lespiau wrote:
> It is now clear that this interrupt is for the primary plane and not
> something global to the pipe. It also matches what the spec calls it.
>
> Signed-off-by: Damien Lespiau <damien.lespiau@intel.com>
Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
> ---
> drivers/gpu/drm/i915/i915_irq.c | 4 ++--
> drivers/gpu/drm/i915/i915_reg.h | 2 +-
> 2 files changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c
> index 4ca0344..7a4d3ae 100644
> --- a/drivers/gpu/drm/i915/i915_irq.c
> +++ b/drivers/gpu/drm/i915/i915_irq.c
> @@ -2060,7 +2060,7 @@ static irqreturn_t gen8_irq_handler(int irq, void *arg)
> if (pipe_iir & GEN8_PIPE_VBLANK)
> drm_handle_vblank(dev, pipe);
>
> - if (pipe_iir & GEN8_PIPE_FLIP_DONE) {
> + if (pipe_iir & GEN8_PIPE_PRIMARY_FLIP_DONE) {
> intel_prepare_page_flip(dev, pipe);
> intel_finish_page_flip_plane(dev, pipe);
> }
> @@ -3250,7 +3250,7 @@ static void gen8_gt_irq_postinstall(struct drm_i915_private *dev_priv)
> static void gen8_de_irq_postinstall(struct drm_i915_private *dev_priv)
> {
> struct drm_device *dev = dev_priv->dev;
> - uint32_t de_pipe_masked = GEN8_PIPE_FLIP_DONE |
> + uint32_t de_pipe_masked = GEN8_PIPE_PRIMARY_FLIP_DONE |
> GEN8_PIPE_CDCLK_CRC_DONE |
> GEN8_DE_PIPE_IRQ_FAULT_ERRORS;
> uint32_t de_pipe_enables = de_pipe_masked | GEN8_PIPE_VBLANK |
> diff --git a/drivers/gpu/drm/i915/i915_reg.h b/drivers/gpu/drm/i915/i915_reg.h
> index bc5ec33..f0c1e56 100644
> --- a/drivers/gpu/drm/i915/i915_reg.h
> +++ b/drivers/gpu/drm/i915/i915_reg.h
> @@ -4209,7 +4209,7 @@ enum punit_power_well {
> #define GEN8_PIPE_SPRITE_FAULT (1 << 9)
> #define GEN8_PIPE_PRIMARY_FAULT (1 << 8)
> #define GEN8_PIPE_SPRITE_FLIP_DONE (1 << 5)
> -#define GEN8_PIPE_FLIP_DONE (1 << 4)
> +#define GEN8_PIPE_PRIMARY_FLIP_DONE (1 << 4)
> #define GEN8_PIPE_SCAN_LINE_EVENT (1 << 2)
> #define GEN8_PIPE_VSYNC (1 << 1)
> #define GEN8_PIPE_VBLANK (1 << 0)
> --
> 1.8.3.1
>
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/intel-gfx
--
Ville Syrjälä
Intel OTC
next prev parent reply other threads:[~2014-04-08 10:31 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-04-08 0:22 [PATCH] drm/i915: Rename GEN8_PIPE_FLIP_DONE to PRIMARY_FLIP_DONE Damien Lespiau
2014-04-08 10:31 ` Ville Syrjälä [this message]
2014-04-09 13:15 ` 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=20140408103134.GF4481@intel.com \
--to=ville.syrjala@linux.intel.com \
--cc=damien.lespiau@intel.com \
--cc=intel-gfx@lists.freedesktop.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 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.