Intel-GFX Archive on lore.kernel.org
 help / color / mirror / Atom feed
From: Ville Syrjala <ville.syrjala@linux.intel.com>
To: intel-gfx@lists.freedesktop.org
Subject: [PATCH 6/6] drm/i915: Protect overlay colorkey macro arguments
Date: Mon, 28 Oct 2019 13:30:36 +0200	[thread overview]
Message-ID: <20191028113036.27553-6-ville.syrjala@linux.intel.com> (raw)
In-Reply-To: <20191028113036.27553-1-ville.syrjala@linux.intel.com>

From: Ville Syrjälä <ville.syrjala@linux.intel.com>

Put the customary () around the macro argument in the overlay
colorkey macros. And while at switch to using a consistent
case for the hex constants.

Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
---
 drivers/gpu/drm/i915/display/intel_overlay.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/drivers/gpu/drm/i915/display/intel_overlay.c b/drivers/gpu/drm/i915/display/intel_overlay.c
index 3241cc98e251..4bc07c1057e2 100644
--- a/drivers/gpu/drm/i915/display/intel_overlay.c
+++ b/drivers/gpu/drm/i915/display/intel_overlay.c
@@ -103,13 +103,13 @@
 #define CLK_RGB15_MASK		0x070707
 
 #define RGB30_TO_COLORKEY(c) \
-	(((c & 0x3FC00000) >> 6) | ((c & 0x000FF000) >> 4) | ((c & 0x000003FC) >> 2))
+	((((c) & 0x3fc00000) >> 6) | (((c) & 0x000ff000) >> 4) | (((c) & 0x000003fc) >> 2))
 #define RGB16_TO_COLORKEY(c) \
-	(((c & 0xF800) << 8) | ((c & 0x07E0) << 5) | ((c & 0x001F) << 3))
+	((((c) & 0xf800) << 8) | (((c) & 0x07e0) << 5) | (((c) & 0x001f) << 3))
 #define RGB15_TO_COLORKEY(c) \
-	(((c & 0x7c00) << 9) | ((c & 0x03E0) << 6) | ((c & 0x001F) << 3))
+	((((c) & 0x7c00) << 9) | (((c) & 0x03e0) << 6) | (((c) & 0x001f) << 3))
 #define RGB8I_TO_COLORKEY(c) \
-	(((c & 0xFF) << 16) | ((c & 0XFF) << 8) | ((c & 0xFF) << 0))
+	((((c) & 0xff) << 16) | (((c) & 0xff) << 8) | (((c) & 0xff) << 0))
 
 /* overlay flip addr flag */
 #define OFC_UPDATE		0x1
-- 
2.21.0

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

WARNING: multiple messages have this Message-ID (diff)
From: Ville Syrjala <ville.syrjala@linux.intel.com>
To: intel-gfx@lists.freedesktop.org
Subject: [Intel-gfx] [PATCH 6/6] drm/i915: Protect overlay colorkey macro arguments
Date: Mon, 28 Oct 2019 13:30:36 +0200	[thread overview]
Message-ID: <20191028113036.27553-6-ville.syrjala@linux.intel.com> (raw)
Message-ID: <20191028113036.eDS627N6qSNVt5nSB7H1CmE0uhNKqAVQ4Aij3IG6Eh4@z> (raw)
In-Reply-To: <20191028113036.27553-1-ville.syrjala@linux.intel.com>

From: Ville Syrjälä <ville.syrjala@linux.intel.com>

Put the customary () around the macro argument in the overlay
colorkey macros. And while at switch to using a consistent
case for the hex constants.

Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
---
 drivers/gpu/drm/i915/display/intel_overlay.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/drivers/gpu/drm/i915/display/intel_overlay.c b/drivers/gpu/drm/i915/display/intel_overlay.c
index 3241cc98e251..4bc07c1057e2 100644
--- a/drivers/gpu/drm/i915/display/intel_overlay.c
+++ b/drivers/gpu/drm/i915/display/intel_overlay.c
@@ -103,13 +103,13 @@
 #define CLK_RGB15_MASK		0x070707
 
 #define RGB30_TO_COLORKEY(c) \
-	(((c & 0x3FC00000) >> 6) | ((c & 0x000FF000) >> 4) | ((c & 0x000003FC) >> 2))
+	((((c) & 0x3fc00000) >> 6) | (((c) & 0x000ff000) >> 4) | (((c) & 0x000003fc) >> 2))
 #define RGB16_TO_COLORKEY(c) \
-	(((c & 0xF800) << 8) | ((c & 0x07E0) << 5) | ((c & 0x001F) << 3))
+	((((c) & 0xf800) << 8) | (((c) & 0x07e0) << 5) | (((c) & 0x001f) << 3))
 #define RGB15_TO_COLORKEY(c) \
-	(((c & 0x7c00) << 9) | ((c & 0x03E0) << 6) | ((c & 0x001F) << 3))
+	((((c) & 0x7c00) << 9) | (((c) & 0x03e0) << 6) | (((c) & 0x001f) << 3))
 #define RGB8I_TO_COLORKEY(c) \
-	(((c & 0xFF) << 16) | ((c & 0XFF) << 8) | ((c & 0xFF) << 0))
+	((((c) & 0xff) << 16) | (((c) & 0xff) << 8) | (((c) & 0xff) << 0))
 
 /* overlay flip addr flag */
 #define OFC_UPDATE		0x1
-- 
2.21.0

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

  parent reply	other threads:[~2019-10-28 11:30 UTC|newest]

Thread overview: 29+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-10-28 11:30 [PATCH 1/6] drm/i915: Fix i845/i865 cursor width Ville Syrjala
2019-10-28 11:30 ` [Intel-gfx] " Ville Syrjala
2019-10-28 11:30 ` [PATCH 2/6] drm/i915: Fix max cursor size for i915g/gm Ville Syrjala
2019-10-28 11:30   ` [Intel-gfx] " Ville Syrjala
2020-05-15 16:31   ` Chris Wilson
2019-10-28 11:30 ` [PATCH 3/6] drm/i915: Fix overlay colorkey for 30bpp and 8bpp Ville Syrjala
2019-10-28 11:30   ` [Intel-gfx] " Ville Syrjala
2020-05-15 16:38   ` Chris Wilson
2019-10-28 11:30 ` [PATCH 4/6] drm/i915: Configure overlay cc_out precision based on crtc gamma config Ville Syrjala
2019-10-28 11:30   ` [Intel-gfx] " Ville Syrjala
2020-05-15 16:40   ` Chris Wilson
2019-10-28 11:30 ` [PATCH 5/6] drm/i915: Enable pipe gamma for the overlay Ville Syrjala
2019-10-28 11:30   ` [Intel-gfx] " Ville Syrjala
2020-05-15 16:40   ` Chris Wilson
2019-10-28 11:30 ` Ville Syrjala [this message]
2019-10-28 11:30   ` [Intel-gfx] [PATCH 6/6] drm/i915: Protect overlay colorkey macro arguments Ville Syrjala
2020-05-15 16:41   ` Chris Wilson
2019-10-28 14:20 ` [PATCH 1/6] drm/i915: Fix i845/i865 cursor width Maarten Lankhorst
2019-10-28 14:20   ` [Intel-gfx] " Maarten Lankhorst
2019-10-28 15:05   ` Ville Syrjälä
2019-10-28 15:05     ` [Intel-gfx] " Ville Syrjälä
2019-10-28 15:57     ` Maarten Lankhorst
2019-10-28 15:57       ` [Intel-gfx] " Maarten Lankhorst
2019-10-28 14:43 ` ✗ Fi.CI.CHECKPATCH: warning for series starting with [1/6] " Patchwork
2019-10-28 14:43   ` [Intel-gfx] " Patchwork
2019-10-28 15:04 ` ✓ Fi.CI.BAT: success " Patchwork
2019-10-28 15:04   ` [Intel-gfx] " Patchwork
2019-10-29 10:10 ` ✗ Fi.CI.IGT: failure " Patchwork
2019-10-29 10:10   ` [Intel-gfx] " Patchwork

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=20191028113036.27553-6-ville.syrjala@linux.intel.com \
    --to=ville.syrjala@linux.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox