diff options
| author |   Nirmoy Das <nirmoy.das@intel.com> | 2024-06-25 11:42:28 +0200 |
|---|---|---|
| committer |   Lucas De Marchi <lucas.demarchi@intel.com> | 2024-06-27 11:56:11 -0700 |
| commit | e71cf19e3119de446cc37ddabb2e161ebbf7357c (patch) | |
| tree | 32b445ee4554ee8c20a60b09a297c8eb58c511c7 | |
| parent | drm/xe/hwmon: Remove xe_hwmon_process_reg (diff) | |
| download | wireguard-linux-e71cf19e3119de446cc37ddabb2e161ebbf7357c.tar.xz wireguard-linux-e71cf19e3119de446cc37ddabb2e161ebbf7357c.zip | |
drm/xe/client: Check return value of xe_force_wake_get
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>
Reviewed-by: Lucas De Marchi <lucas.demarchi@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20240625094228.5327-1-nirmoy.das@intel.com
Signed-off-by: Lucas De Marchi <lucas.demarchi@intel.com>
| -rw-r--r-- | drivers/gpu/drm/xe/xe_drm_client.c | 8 |
1 files 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; } |