From: Jesse Barnes <jbarnes@virtuousgeek.org>
To: Imre Deak <imre.deak@intel.com>
Cc: intel-gfx@lists.freedesktop.org
Subject: Re: [PATCH 4/7] drm/i915: unify FLIP_DONE macro names
Date: Wed, 5 Feb 2014 15:29:02 +0000 [thread overview]
Message-ID: <20140205152902.7577ba4d@jbarnes-t420> (raw)
In-Reply-To: <1391542551-20239-5-git-send-email-imre.deak@intel.com>
On Tue, 4 Feb 2014 21:35:48 +0200
Imre Deak <imre.deak@intel.com> wrote:
> s/FLIPDONE/FLIP_DONE/ to make all FLIP_DONE macro names consistent.
>
> No functional change.
>
> Signed-off-by: Imre Deak <imre.deak@intel.com>
> ---
> drivers/gpu/drm/i915/i915_irq.c | 2 +-
> drivers/gpu/drm/i915/i915_reg.h | 18 +++++++++---------
> 2 files changed, 10 insertions(+), 10 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c
> index e0e5190..3b876ee 100644
> --- a/drivers/gpu/drm/i915/i915_irq.c
> +++ b/drivers/gpu/drm/i915/i915_irq.c
> @@ -1500,7 +1500,7 @@ static void valleyview_pipestat_irq_handler(struct drm_device *dev, u32 iir)
> if (pipe_stats[pipe] & PIPE_START_VBLANK_INTERRUPT_STATUS)
> drm_handle_vblank(dev, pipe);
>
> - if (pipe_stats[pipe] & PLANE_FLIPDONE_INT_STATUS_VLV) {
> + if (pipe_stats[pipe] & PLANE_FLIP_DONE_INT_STATUS_VLV) {
> intel_prepare_page_flip(dev, pipe);
> intel_finish_page_flip(dev, pipe);
> }
> diff --git a/drivers/gpu/drm/i915/i915_reg.h b/drivers/gpu/drm/i915/i915_reg.h
> index abd18cd..8eefb26 100644
> --- a/drivers/gpu/drm/i915/i915_reg.h
> +++ b/drivers/gpu/drm/i915/i915_reg.h
> @@ -3227,7 +3227,7 @@
> #define PIPECONF_DITHER_TYPE_TEMP (3<<2)
> #define _PIPEASTAT (dev_priv->info->display_mmio_offset + 0x70024)
> #define PIPE_FIFO_UNDERRUN_STATUS (1UL<<31)
> -#define SPRITE1_FLIPDONE_INT_EN_VLV (1UL<<30)
> +#define SPRITE1_FLIP_DONE_INT_EN_VLV (1UL<<30)
> #define PIPE_CRC_ERROR_ENABLE (1UL<<29)
> #define PIPE_CRC_DONE_ENABLE (1UL<<28)
> #define PIPE_GMBUS_EVENT_ENABLE (1UL<<27)
> @@ -3245,12 +3245,12 @@
> #define PIPE_VBLANK_INTERRUPT_ENABLE (1UL<<17)
> #define PIPEA_HBLANK_INT_EN_VLV (1UL<<16)
> #define PIPE_OVERLAY_UPDATED_ENABLE (1UL<<16)
> -#define SPRITE1_FLIPDONE_INT_STATUS_VLV (1UL<<15)
> -#define SPRITE0_FLIPDONE_INT_STATUS_VLV (1UL<<14)
> +#define SPRITE1_FLIP_DONE_INT_STATUS_VLV (1UL<<15)
> +#define SPRITE0_FLIP_DONE_INT_STATUS_VLV (1UL<<14)
> #define PIPE_CRC_ERROR_INTERRUPT_STATUS (1UL<<13)
> #define PIPE_CRC_DONE_INTERRUPT_STATUS (1UL<<12)
> #define PIPE_GMBUS_INTERRUPT_STATUS (1UL<<11)
> -#define PLANE_FLIPDONE_INT_STATUS_VLV (1UL<<10)
> +#define PLANE_FLIP_DONE_INT_STATUS_VLV (1UL<<10)
> #define PIPE_HOTPLUG_INTERRUPT_STATUS (1UL<<10)
> #define PIPE_VSYNC_INTERRUPT_STATUS (1UL<<9)
> #define PIPE_DISPLAY_LINE_COMPARE_STATUS (1UL<<8)
> @@ -3286,14 +3286,14 @@
> #define PIPEB_LINE_COMPARE_INT_EN (1<<29)
> #define PIPEB_HLINE_INT_EN (1<<28)
> #define PIPEB_VBLANK_INT_EN (1<<27)
> -#define SPRITED_FLIPDONE_INT_EN (1<<26)
> -#define SPRITEC_FLIPDONE_INT_EN (1<<25)
> -#define PLANEB_FLIPDONE_INT_EN (1<<24)
> +#define SPRITED_FLIP_DONE_INT_EN (1<<26)
> +#define SPRITEC_FLIP_DONE_INT_EN (1<<25)
> +#define PLANEB_FLIP_DONE_INT_EN (1<<24)
> #define PIPEA_LINE_COMPARE_INT_EN (1<<21)
> #define PIPEA_HLINE_INT_EN (1<<20)
> #define PIPEA_VBLANK_INT_EN (1<<19)
> -#define SPRITEB_FLIPDONE_INT_EN (1<<18)
> -#define SPRITEA_FLIPDONE_INT_EN (1<<17)
> +#define SPRITEB_FLIP_DONE_INT_EN (1<<18)
> +#define SPRITEA_FLIP_DONE_INT_EN (1<<17)
> #define PLANEA_FLIPDONE_INT_EN (1<<16)
>
> #define DPINVGTT (VLV_DISPLAY_BASE + 0x7002c) /* VLV only */
Reviewed-by: Jesse Barnes <jbarnes@virtuousgeek.org>
next prev parent reply other threads:[~2014-02-05 15:29 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-02-04 19:35 [PATCH 0/7] drm/i915: vlv: handle only enabled pipestat interrupts Imre Deak
2014-02-04 19:35 ` [PATCH 1/7] drm/i915: vlv: don't unmask IIR[DISPLAY_PIPE_A/B_VBLANK] interrupt Imre Deak
2014-02-05 15:22 ` Jesse Barnes
2014-02-04 19:35 ` [PATCH 2/7] drm/i915: factor out valleyview_pipestat_irq_handler Imre Deak
2014-02-05 15:24 ` Jesse Barnes
2014-02-05 16:05 ` Daniel Vetter
2014-02-06 7:14 ` Jani Nikula
2014-02-06 9:44 ` Daniel Vetter
2014-02-04 19:35 ` [PATCH 3/7] drm/i915: vlv: s/spin_lock_irqsave/spin_lock/ in irq handler Imre Deak
2014-02-05 15:28 ` Jesse Barnes
2014-02-04 19:35 ` [PATCH 4/7] drm/i915: unify FLIP_DONE macro names Imre Deak
2014-02-05 15:29 ` Jesse Barnes [this message]
2014-02-04 19:35 ` [PATCH 5/7] drm/i915: pass status instead of enable flags to i915_enable_pipestat Imre Deak
2014-02-05 15:35 ` Jesse Barnes
2014-02-05 16:12 ` Daniel Vetter
2014-02-05 16:53 ` Ville Syrjälä
2014-02-05 18:55 ` [PATCH v2 " Imre Deak
2014-02-04 19:35 ` [PATCH 6/7] drm/i915: vlv: fix mapping of pipestat enable to status bits Imre Deak
2014-02-05 14:54 ` Ville Syrjälä
2014-02-05 15:04 ` Imre Deak
2014-02-05 18:55 ` [PATCH v2 " Imre Deak
2014-02-05 19:06 ` Ville Syrjälä
2014-02-05 19:44 ` [PATCH v3 " Imre Deak
2014-02-04 19:35 ` [PATCH 7/7] drm/i915: vlv: handle only enabled pipestat interrupt events Imre Deak
2014-02-05 15:11 ` Ville Syrjälä
2014-02-05 15:22 ` Imre Deak
2014-02-05 18:55 ` [PATCH v2 " Imre Deak
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=20140205152902.7577ba4d@jbarnes-t420 \
--to=jbarnes@virtuousgeek.org \
--cc=imre.deak@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.