Igt-dev Archive on lore.kernel.org
 help / color / mirror / Atom feed
From: Lucas De Marchi <lucas.demarchi@intel.com>
To: igt-dev@lists.freedesktop.org
Subject: [CI i-g-t 5/5] lib/igt_gt: Stop passing fd == -1 in igt_open_forcewake_handle()
Date: Wed, 25 Sep 2024 23:16:51 -0500	[thread overview]
Message-ID: <20240926041651.412396-5-lucas.demarchi@intel.com> (raw)
In-Reply-To: <20240926041651.412396-1-lucas.demarchi@intel.com>

If something like -1 is needed, then
igt_open_forcewake_handle_for_pcidev() should be used.

Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: Lucas De Marchi <lucas.demarchi@intel.com>
---
 lib/igt_gt.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/lib/igt_gt.c b/lib/igt_gt.c
index 95df4acb9..9641a6610 100644
--- a/lib/igt_gt.c
+++ b/lib/igt_gt.c
@@ -493,6 +493,7 @@ void igt_stop_hang_helper(void)
 
 /**
  * igt_open_forcewake_handle:
+ * @fd: drm fd - i915 or xe
  *
  * This functions opens the debugfs forcewake file and so prevents the GT from
  * suspending. The reference is automatically dropped when the is closed.
@@ -509,8 +510,10 @@ int igt_open_forcewake_handle(int fd)
 
 	if (is_xe_device(fd))
 		fn = "forcewake_all";
-	else
+	else if (is_i915_device(fd))
 		fn = "i915_forcewake_user";
+	else
+		return -1;
 
 	return igt_debugfs_open(fd, fn, O_RDONLY);
 }
-- 
2.46.1


  parent reply	other threads:[~2024-09-26  4:17 UTC|newest]

Thread overview: 13+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-09-26  4:16 [CI i-g-t 1/5] lib/igt_gt: Fix forcewake open Lucas De Marchi
2024-09-26  4:16 ` [CI i-g-t 2/5] lib/igt_gt: Make igt_open_forcewake_handle() xe-compatible Lucas De Marchi
2024-09-26  4:16 ` [CI i-g-t 3/5] lib/igt_gt: Add igt_open_forcewake_handle_for_pcidev() Lucas De Marchi
2024-09-26  4:16 ` [CI i-g-t 4/5] treewide: Fix intel_register_access_init() Lucas De Marchi
2024-09-26  4:16 ` Lucas De Marchi [this message]
2024-09-26 10:24 ` ✗ Fi.CI.BAT: failure for series starting with [CI,i-g-t,1/5] lib/igt_gt: Fix forcewake open Patchwork
2024-09-26 10:36 ` ✓ CI.xeBAT: success " Patchwork
2024-09-27  2:59 ` ✗ CI.xeFULL: failure " Patchwork
2024-09-30 19:47 ` ✓ CI.xeBAT: success for series starting with [CI,i-g-t,1/5] lib/igt_gt: Fix forcewake open (rev2) Patchwork
2024-09-30 19:54 ` ✓ Fi.CI.BAT: " Patchwork
2024-10-01  2:36 ` ✗ CI.xeFULL: failure " Patchwork
2024-10-01  6:29   ` Lucas De Marchi
2024-10-01  6:20 ` ✗ 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=20240926041651.412396-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