Igt-dev Archive on lore.kernel.org
 help / color / mirror / Atom feed
From: Nirmoy Das <nirmoy.das@intel.com>
To: igt-dev@lists.freedesktop.org
Cc: Nirmoy Das <nirmoy.das@intel.com>
Subject: [PATCH i-g-t v5 2/3] lib/xe/xe_query: Fix compilation -Wshadow warning
Date: Wed, 17 Jan 2024 18:28:45 +0100	[thread overview]
Message-ID: <20240117172848.21144-2-nirmoy.das@intel.com> (raw)
In-Reply-To: <20240117172848.21144-1-nirmoy.das@intel.com>

Fix -Wshadow warning when xe_for_each_engine() and
xe_for_each_mem_region are used together.

v2: Use igt_unique(Kamil)

Signed-off-by: Nirmoy Das <nirmoy.das@intel.com>
Reviewed-by: Janga Rahul Kumar <janga.rahul.kumar@intel.com>
---
 lib/xe/xe_query.h | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/lib/xe/xe_query.h b/lib/xe/xe_query.h
index 1e3a7bdb9..2460384c9 100644
--- a/lib/xe/xe_query.h
+++ b/lib/xe/xe_query.h
@@ -58,8 +58,8 @@ struct xe_device {
 };
 
 #define xe_for_each_engine(__fd, __hwe) \
-	for (int __i = 0; __i < xe_number_engines(__fd) && \
-	     (__hwe = &xe_engine(__fd, __i)->instance); ++__i)
+	for (int igt_unique(__i) = 0; igt_unique(__i) < xe_number_engines(__fd) && \
+	     (__hwe = &xe_engine(__fd, igt_unique(__i))->instance); ++igt_unique(__i))
 #define xe_for_each_engine_class(__class) \
 	for (__class = 0; __class < DRM_XE_ENGINE_CLASS_COMPUTE + 1; \
 	     ++__class)
@@ -67,8 +67,8 @@ struct xe_device {
 	for (__gt = 0; __gt < xe_number_gt(__fd); ++__gt)
 
 #define xe_for_each_mem_region(__fd, __memreg, __r) \
-	for (uint64_t __i = 0; __i < igt_fls(__memreg); __i++) \
-		for_if(__r = (__memreg & (1ull << __i)))
+	for (uint64_t igt_unique(__i) = 0; igt_unique(__i) < igt_fls(__memreg); igt_unique(__i)++) \
+		for_if(__r = (__memreg & (1ull << igt_unique(__i))))
 
 #define XE_IS_CLASS_SYSMEM(__region) ((__region)->mem_class == DRM_XE_MEM_REGION_CLASS_SYSMEM)
 #define XE_IS_CLASS_VRAM(__region) ((__region)->mem_class == DRM_XE_MEM_REGION_CLASS_VRAM)
-- 
2.42.0

  reply	other threads:[~2024-01-17 17:42 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-01-17 17:28 [PATCH i-g-t v5 1/3] tests/intel: Add xe_exec_atomic test Nirmoy Das
2024-01-17 17:28 ` Nirmoy Das [this message]
2024-01-17 18:44   ` [PATCH i-g-t v5 2/3] lib/xe/xe_query: Fix compilation -Wshadow warning Kamil Konieczny
2024-01-17 17:28 ` [PATCH i-g-t v5 3/3] tests/intel-ci: Add mi_atomic test to fast-feedback Nirmoy Das
2024-01-17 19:35 ` ✓ Fi.CI.BAT: success for series starting with [i-g-t,v5,1/3] tests/intel: Add xe_exec_atomic test Patchwork
2024-01-17 20:21 ` ✓ CI.xeBAT: " Patchwork
2024-01-17 23:16 ` ✗ Fi.CI.IGT: failure " Patchwork
2024-01-18  9:36   ` Kamil Konieczny

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=20240117172848.21144-2-nirmoy.das@intel.com \
    --to=nirmoy.das@intel.com \
    --cc=igt-dev@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