Re: [PATCH v2 21/30] drm/xe/query: Use scope-based forcewake

[Gustavo Sousa <gustavo.sousa@intel.com>]

Quoting Matt Roper (2025-11-10 20:20:39-03:00)
>Use scope-based forcewake handling for consistency with other parts of
>the driver.
>
>Signed-off-by: Matt Roper <matthew.d.roper@intel.com>

Reviewed-by: Gustavo Sousa <gustavo.sousa@intel.com>

>---
> drivers/gpu/drm/xe/xe_query.c | 16 ++++++----------
> 1 file changed, 6 insertions(+), 10 deletions(-)
>
>diff --git a/drivers/gpu/drm/xe/xe_query.c b/drivers/gpu/drm/xe/xe_query.c
>index 1c0915e2cc16..a7bf1fd6dd6a 100644
>--- a/drivers/gpu/drm/xe/xe_query.c
>+++ b/drivers/gpu/drm/xe/xe_query.c
>@@ -122,7 +122,6 @@ query_engine_cycles(struct xe_device *xe,
>         __ktime_func_t cpu_clock;
>         struct xe_hw_engine *hwe;
>         struct xe_gt *gt;
>-        unsigned int fw_ref;
> 
>         if (IS_SRIOV_VF(xe))
>                 return -EOPNOTSUPP;
>@@ -158,17 +157,14 @@ query_engine_cycles(struct xe_device *xe,
>         if (!hwe)
>                 return -EINVAL;
> 
>-        fw_ref = xe_force_wake_get(gt_to_fw(gt), XE_FORCEWAKE_ALL);
>-        if (!xe_force_wake_ref_has_domain(fw_ref, XE_FORCEWAKE_ALL))  {
>-                xe_force_wake_put(gt_to_fw(gt), fw_ref);
>-                return -EIO;
>+        xe_with_force_wake(fw_ref, gt_to_fw(gt), XE_FORCEWAKE_ALL) {
>+                if (!xe_force_wake_ref_has_domain(fw_ref.domains, XE_FORCEWAKE_ALL))
>+                        return -EIO;
>+
>+                hwe_read_timestamp(hwe, &resp.engine_cycles, &resp.cpu_timestamp,
>+                                   &resp.cpu_delta, cpu_clock);
>         }
> 
>-        hwe_read_timestamp(hwe, &resp.engine_cycles, &resp.cpu_timestamp,
>-                           &resp.cpu_delta, cpu_clock);
>-
>-        xe_force_wake_put(gt_to_fw(gt), fw_ref);
>-
>         if (GRAPHICS_VER(xe) >= 20)
>                 resp.width = 64;
>         else
>-- 
>2.51.1
>