From: Lucas De Marchi <lucas.demarchi@intel.com>
To: igt-dev@lists.freedesktop.org
Cc: Lucas De Marchi <lucas.demarchi@intel.com>
Subject: [PATCH i-g-t 4/6] lib/igt_gt: Fallback on filenames in igt_open_forcewake_handle()
Date: Wed, 18 Sep 2024 09:36:27 -0700 [thread overview]
Message-ID: <20240918163629.1186314-5-lucas.demarchi@intel.com> (raw)
In-Reply-To: <20240918163629.1186314-1-lucas.demarchi@intel.com>
If fd is -1, we don't know what file should be used for forcewake.
We could open the debugfs dir and figure out from there, but it's also
cheap to just handle a fallback approach. Ideally fd == -1 wouldn't be
passed and eventually this could be removed.
Signed-off-by: Lucas De Marchi <lucas.demarchi@intel.com>
---
lib/igt_gt.c | 24 +++++++++++++++++++-----
1 file changed, 19 insertions(+), 5 deletions(-)
diff --git a/lib/igt_gt.c b/lib/igt_gt.c
index c84368fbd..3df3fdb63 100644
--- a/lib/igt_gt.c
+++ b/lib/igt_gt.c
@@ -502,17 +502,31 @@ void igt_stop_hang_helper(void)
*/
int igt_open_forcewake_handle(int fd)
{
- const char *fn;
+ enum {
+ I915,
+ XE,
+ };
+ const char *fn[] = {
+ [I915] = "i915_forcewake_user",
+ [XE] = "forcewake_all",
+ };
if (getenv("IGT_NO_FORCEWAKE"))
return -1;
if (is_xe_device(fd))
- fn = "forcewake_all";
- else
- fn = "i915_forcewake_user";
+ return igt_debugfs_open(fd, fn[XE], O_RDONLY);
+ if (is_i915_device(fd))
+ return igt_debugfs_open(fd, fn[XE], O_RDONLY);
+
+ for (unsigned int i = 0; i < ARRAY_SIZE(fn); i++) {
+ int ret = igt_debugfs_open(fd, fn[i], O_RDONLY);
+
+ if (ret >= 0)
+ return ret;
+ }
- return igt_debugfs_open(fd, fn, O_RDONLY);
+ return -ENOENT;
}
#if defined(__x86_64__) || defined(__i386__)
--
2.46.1
next prev parent reply other threads:[~2024-09-18 16:36 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-09-18 16:36 [PATCH i-g-t 0/6] Add forcewake support for xe Lucas De Marchi
2024-09-18 16:36 ` [PATCH i-g-t 1/6] lib/igt_gt: Fix forcewake open Lucas De Marchi
2024-09-20 16:58 ` Matt Roper
2024-09-18 16:36 ` [PATCH i-g-t 2/6] lib/igt_gt: Document fd argument in igt_open_forcewake_handle() Lucas De Marchi
2024-09-20 17:15 ` Matt Roper
2024-09-20 20:20 ` Lucas De Marchi
2024-09-18 16:36 ` [PATCH i-g-t 3/6] lib/igt_gt: Make igt_open_forcewake_handle() xe-compatible Lucas De Marchi
2024-09-20 17:17 ` Matt Roper
2024-09-18 16:36 ` Lucas De Marchi [this message]
2024-09-18 19:16 ` [PATCH i-g-t v1.1] lib/igt_gt: Fallback on filenames in igt_open_forcewake_handle() Lucas De Marchi
2024-09-20 17:27 ` Matt Roper
2024-09-18 16:36 ` [PATCH i-g-t 5/6] tools/intel_reg: Add wrapper for reg access init Lucas De Marchi
2024-09-20 17:35 ` Matt Roper
2024-09-18 16:36 ` [PATCH i-g-t 6/6] tools/intel_reg: Add forcewake support to xe Lucas De Marchi
2024-09-20 17:43 ` Ville Syrjälä
2024-09-20 18:01 ` Matt Roper
2024-09-20 18:04 ` Matt Roper
2024-09-20 18:30 ` Ville Syrjälä
2024-09-20 19:43 ` Lucas De Marchi
2024-09-18 17:47 ` ✓ CI.xeBAT: success for Add forcewake support for xe Patchwork
2024-09-18 17:48 ` ✗ Fi.CI.BAT: failure " Patchwork
2024-09-18 19:42 ` ✓ CI.xeBAT: success for Add forcewake support for xe (rev2) Patchwork
2024-09-18 19:54 ` ✓ Fi.CI.BAT: " Patchwork
2024-09-19 3:57 ` ✗ CI.xeFULL: failure for Add forcewake support for xe Patchwork
2024-09-19 6:06 ` ✗ CI.xeFULL: failure for Add forcewake support for xe (rev2) Patchwork
2024-09-19 7:27 ` ✗ Fi.CI.IGT: " 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=20240918163629.1186314-5-lucas.demarchi@intel.com \
--to=lucas.demarchi@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