From: Nirmoy Das <nirmoy.das@intel.com>
To: intel-xe@lists.freedesktop.org
Cc: Nirmoy Das <nirmoy.das@intel.com>,
Himal Prasad Ghimiray <himal.prasad.ghimiray@intel.com>,
Lucas De Marchi <lucas.demarchi@intel.com>,
Rodrigo Vivi <rodrigo.vivi@intel.com>
Subject: [PATCH RESEND] drm/xe/client: Check return value of xe_force_wake_get
Date: Tue, 25 Jun 2024 11:42:28 +0200 [thread overview]
Message-ID: <20240625094228.5327-1-nirmoy.das@intel.com> (raw)
xe_force_wake_get() can return error so check it's return value
before reading gpu_timestamp value.
v2: set HWE to NULL instead of setting timestamp to 0(Lucas)
Add a warn on for xe_force_wake_put(Himal)
Fixes: 188ced1e0ff8 ("drm/xe/client: Print runtime to fdinfo")
Cc: Himal Prasad Ghimiray <himal.prasad.ghimiray@intel.com>
Cc: Lucas De Marchi <lucas.demarchi@intel.com>
Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
Signed-off-by: Nirmoy Das <nirmoy.das@intel.com>
---
drivers/gpu/drm/xe/xe_drm_client.c | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/drivers/gpu/drm/xe/xe_drm_client.c b/drivers/gpu/drm/xe/xe_drm_client.c
index 4a19b771e3a0..4bdb909eabfc 100644
--- a/drivers/gpu/drm/xe/xe_drm_client.c
+++ b/drivers/gpu/drm/xe/xe_drm_client.c
@@ -264,9 +264,13 @@ static void show_run_ticks(struct drm_printer *p, struct drm_file *file)
if (!hwe)
continue;
- xe_force_wake_get(gt_to_fw(gt), XE_FW_GT);
+ if (xe_force_wake_get(gt_to_fw(gt), XE_FW_GT)) {
+ hwe = NULL;
+ break;
+ }
+
gpu_timestamp = xe_hw_engine_read_timestamp(hwe);
- xe_force_wake_put(gt_to_fw(gt), XE_FW_GT);
+ XE_WARN_ON(xe_force_wake_put(gt_to_fw(gt), XE_FW_GT));
break;
}
--
2.42.0
next reply other threads:[~2024-06-25 9:57 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-06-25 9:42 Nirmoy Das [this message]
2024-06-25 10:00 ` [PATCH RESEND] drm/xe/client: Check return value of xe_force_wake_get Nirmoy Das
2024-06-25 10:02 ` ✓ CI.Patch_applied: success for drm/xe/client: Check return value of xe_force_wake_get (rev5) Patchwork
2024-06-25 10:02 ` ✓ CI.checkpatch: " Patchwork
2024-06-25 10:03 ` ✓ CI.KUnit: " Patchwork
2024-06-25 10:15 ` ✓ CI.Build: " Patchwork
2024-06-25 10:17 ` ✗ CI.Hooks: failure " Patchwork
2024-06-25 10:19 ` ✓ CI.checksparse: success " Patchwork
2024-06-25 10:42 ` ✓ CI.BAT: " Patchwork
2024-06-25 13:17 ` ✗ CI.FULL: failure " Patchwork
2024-06-27 19:00 ` [PATCH RESEND] drm/xe/client: Check return value of xe_force_wake_get Lucas De Marchi
2024-06-28 8:48 ` Nirmoy Das
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=20240625094228.5327-1-nirmoy.das@intel.com \
--to=nirmoy.das@intel.com \
--cc=himal.prasad.ghimiray@intel.com \
--cc=intel-xe@lists.freedesktop.org \
--cc=lucas.demarchi@intel.com \
--cc=rodrigo.vivi@intel.com \
/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