Re: [PATCH v2 22/30] drm/xe/reg_sr: Use scope-based forcewake

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

Quoting Matt Roper (2025-11-10 20:20:40-03:00)
>Use scope-based forcewake to slightly simplify the reg_sr code.
>
>Signed-off-by: Matt Roper <matthew.d.roper@intel.com>

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

>---
> drivers/gpu/drm/xe/xe_reg_sr.c | 17 +++++------------
> 1 file changed, 5 insertions(+), 12 deletions(-)
>
>diff --git a/drivers/gpu/drm/xe/xe_reg_sr.c b/drivers/gpu/drm/xe/xe_reg_sr.c
>index fc8447a838c4..1a465385f909 100644
>--- a/drivers/gpu/drm/xe/xe_reg_sr.c
>+++ b/drivers/gpu/drm/xe/xe_reg_sr.c
>@@ -168,7 +168,6 @@ void xe_reg_sr_apply_mmio(struct xe_reg_sr *sr, struct xe_gt *gt)
> {
>         struct xe_reg_sr_entry *entry;
>         unsigned long reg;
>-        unsigned int fw_ref;
> 
>         if (xa_empty(&sr->xa))
>                 return;
>@@ -178,20 +177,14 @@ void xe_reg_sr_apply_mmio(struct xe_reg_sr *sr, struct xe_gt *gt)
> 
>         xe_gt_dbg(gt, "Applying %s save-restore MMIOs\n", sr->name);
> 
>-        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))
>-                goto err_force_wake;
>+        CLASS(xe_force_wake, fw_ref)(gt_to_fw(gt), XE_FORCEWAKE_ALL);
>+        if (!xe_force_wake_ref_has_domain(fw_ref.domains, XE_FORCEWAKE_ALL)) {
>+                xe_gt_err(gt, "Failed to apply, err=-ETIMEDOUT\n");
>+                return;
>+        }
> 
>         xa_for_each(&sr->xa, reg, entry)
>                 apply_one_mmio(gt, entry);
>-
>-        xe_force_wake_put(gt_to_fw(gt), fw_ref);
>-
>-        return;
>-
>-err_force_wake:
>-        xe_force_wake_put(gt_to_fw(gt), fw_ref);
>-        xe_gt_err(gt, "Failed to apply, err=-ETIMEDOUT\n");
> }
> 
> /**
>-- 
>2.51.1
>