From: Daniel Vetter <daniel@ffwll.ch>
To: Damien Lespiau <damien.lespiau@intel.com>
Cc: intel-gfx@lists.freedesktop.org
Subject: Re: [PATCH] drm/i915: Remove spurious '()' in WARN macros
Date: Tue, 18 Mar 2014 10:01:07 +0100 [thread overview]
Message-ID: <20140318090107.GY30571@phenom.ffwll.local> (raw)
In-Reply-To: <1395079188-7279-1-git-send-email-damien.lespiau@intel.com>
On Mon, Mar 17, 2014 at 05:59:48PM +0000, Damien Lespiau wrote:
> No need of any here.
>
> Signed-off-by: Damien Lespiau <damien.lespiau@intel.com>
Queued for -next, thanks for the patch.
-Daniel
> ---
> drivers/gpu/drm/i915/intel_display.c | 8 ++++----
> 1 file changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
> index d34add5..c6743f0 100644
> --- a/drivers/gpu/drm/i915/intel_display.c
> +++ b/drivers/gpu/drm/i915/intel_display.c
> @@ -1166,7 +1166,7 @@ static void assert_planes_disabled(struct drm_i915_private *dev_priv,
> if (INTEL_INFO(dev)->gen >= 4) {
> reg = DSPCNTR(pipe);
> val = I915_READ(reg);
> - WARN((val & DISPLAY_PLANE_ENABLE),
> + WARN(val & DISPLAY_PLANE_ENABLE,
> "plane %c assertion failure, should be disabled but not\n",
> plane_name(pipe));
> return;
> @@ -1195,20 +1195,20 @@ static void assert_sprites_disabled(struct drm_i915_private *dev_priv,
> for_each_sprite(pipe, sprite) {
> reg = SPCNTR(pipe, sprite);
> val = I915_READ(reg);
> - WARN((val & SP_ENABLE),
> + WARN(val & SP_ENABLE,
> "sprite %c assertion failure, should be off on pipe %c but is still active\n",
> sprite_name(pipe, sprite), pipe_name(pipe));
> }
> } else if (INTEL_INFO(dev)->gen >= 7) {
> reg = SPRCTL(pipe);
> val = I915_READ(reg);
> - WARN((val & SPRITE_ENABLE),
> + WARN(val & SPRITE_ENABLE,
> "sprite %c assertion failure, should be off on pipe %c but is still active\n",
> plane_name(pipe), pipe_name(pipe));
> } else if (INTEL_INFO(dev)->gen >= 5) {
> reg = DVSCNTR(pipe);
> val = I915_READ(reg);
> - WARN((val & DVS_ENABLE),
> + WARN(val & DVS_ENABLE,
> "sprite %c assertion failure, should be off on pipe %c but is still active\n",
> plane_name(pipe), pipe_name(pipe));
> }
> --
> 1.8.3.1
>
> _______________________________________________
> 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
prev parent reply other threads:[~2014-03-18 9:01 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-03-17 17:59 [PATCH] drm/i915: Remove spurious '()' in WARN macros Damien Lespiau
2014-03-18 9:01 ` Daniel Vetter [this message]
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=20140318090107.GY30571@phenom.ffwll.local \
--to=daniel@ffwll.ch \
--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.