drm/xe/gt_idle: Use scope-based cleanup

Use scope-based cleanup for runtime PM and forcewake in the GT idle
code.

v2:
 - Use scoped_guard() over guard() in idle_status_show() and
   idle_residency_ms_show().  (Gustavo)
 - Eliminate unnecessary 'ret' local variable in name_show().

Reviewed-by: Gustavo Sousa <gustavo.sousa@intel.com>
Link: https://patch.msgid.link/20251118164338.3572146-33-matthew.d.roper@intel.com
Signed-off-by: Matt Roper <matthew.d.roper@intel.com>

diff --git a/drivers/gpu/drm/xe/xe_gt_idle.c b/drivers/gpu/drm/xe/xe_gt_idle.c
index bdc9d9877ec490bdaf894b429178a92b2c67d590..3ca7bd7c9bcd53d67a02c776cf495d2e1d51154e 100644 (file)
--- a/drivers/gpu/drm/xe/xe_gt_idle.c
+++ b/drivers/gpu/drm/xe/xe_gt_idle.c
@@ -103,7 +103,6 @@ void xe_gt_idle_enable_pg(struct xe_gt *gt)
        struct xe_gt_idle *gtidle = &gt->gtidle;
        struct xe_mmio *mmio = &gt->mmio;
        u32 vcs_mask, vecs_mask;
-       unsigned int fw_ref;
        int i, j;
 
        if (IS_SRIOV_VF(xe))
@@ -135,7 +134,7 @@ void xe_gt_idle_enable_pg(struct xe_gt *gt)
                }
        }
 
-       fw_ref = xe_force_wake_get(gt_to_fw(gt), XE_FW_GT);
+       CLASS(xe_force_wake, fw_ref)(gt_to_fw(gt), XE_FW_GT);
        if (xe->info.skip_guc_pc) {
                /*
                 * GuC sets the hysteresis value when GuC PC is enabled
@@ -146,13 +145,11 @@ void xe_gt_idle_enable_pg(struct xe_gt *gt)
        }
 
        xe_mmio_write32(mmio, POWERGATE_ENABLE, gtidle->powergate_enable);
-       xe_force_wake_put(gt_to_fw(gt), fw_ref);
 }
 
 void xe_gt_idle_disable_pg(struct xe_gt *gt)
 {
        struct xe_gt_idle *gtidle = &gt->gtidle;
-       unsigned int fw_ref;
 
        if (IS_SRIOV_VF(gt_to_xe(gt)))
                return;
@@ -160,9 +157,8 @@ void xe_gt_idle_disable_pg(struct xe_gt *gt)
        xe_device_assert_mem_access(gt_to_xe(gt));
        gtidle->powergate_enable = 0;
 
-       fw_ref = xe_force_wake_get(gt_to_fw(gt), XE_FW_GT);
+       CLASS(xe_force_wake, fw_ref)(gt_to_fw(gt), XE_FW_GT);
        xe_mmio_write32(&gt->mmio, POWERGATE_ENABLE, gtidle->powergate_enable);
-       xe_force_wake_put(gt_to_fw(gt), fw_ref);
 }
 
 /**
@@ -181,7 +177,6 @@ int xe_gt_idle_pg_print(struct xe_gt *gt, struct drm_printer *p)
        enum xe_gt_idle_state state;
        u32 pg_enabled, pg_status = 0;
        u32 vcs_mask, vecs_mask;
-       unsigned int fw_ref;
        int n;
        /*
         * Media Slices
@@ -218,14 +213,12 @@ int xe_gt_idle_pg_print(struct xe_gt *gt, struct drm_printer *p)
 
        /* Do not wake the GT to read powergating status */
        if (state != GT_IDLE_C6) {
-               fw_ref = xe_force_wake_get(gt_to_fw(gt), XE_FW_GT);
-               if (!fw_ref)
+               CLASS(xe_force_wake, fw_ref)(gt_to_fw(gt), XE_FW_GT);
+               if (!fw_ref.domains)
                        return -ETIMEDOUT;
 
                pg_enabled = xe_mmio_read32(&gt->mmio, POWERGATE_ENABLE);
                pg_status = xe_mmio_read32(&gt->mmio, POWERGATE_DOMAIN_STATUS);
-
-               xe_force_wake_put(gt_to_fw(gt), fw_ref);
        }
 
        if (gt->info.engine_mask & XE_HW_ENGINE_RCS_MASK) {
@@ -263,13 +256,9 @@ static ssize_t name_show(struct kobject *kobj,
        struct device *dev = kobj_to_dev(kobj);
        struct xe_gt_idle *gtidle = dev_to_gtidle(dev);
        struct xe_guc_pc *pc = gtidle_to_pc(gtidle);
-       ssize_t ret;
-
-       xe_pm_runtime_get(pc_to_xe(pc));
-       ret = sysfs_emit(buff, "%s\n", gtidle->name);
-       xe_pm_runtime_put(pc_to_xe(pc));
 
-       return ret;
+       guard(xe_pm_runtime)(pc_to_xe(pc));
+       return sysfs_emit(buff, "%s\n", gtidle->name);
 }
 static struct kobj_attribute name_attr = __ATTR_RO(name);
 
@@ -281,9 +270,8 @@ static ssize_t idle_status_show(struct kobject *kobj,
        struct xe_guc_pc *pc = gtidle_to_pc(gtidle);
        enum xe_gt_idle_state state;
 
-       xe_pm_runtime_get(pc_to_xe(pc));
-       state = gtidle->idle_status(pc);
-       xe_pm_runtime_put(pc_to_xe(pc));
+       scoped_guard(xe_pm_runtime, pc_to_xe(pc))
+               state = gtidle->idle_status(pc);
 
        return sysfs_emit(buff, "%s\n", gt_idle_state_to_string(state));
 }
@@ -311,9 +299,8 @@ static ssize_t idle_residency_ms_show(struct kobject *kobj,
        struct xe_guc_pc *pc = gtidle_to_pc(gtidle);
        u64 residency;
 
-       xe_pm_runtime_get(pc_to_xe(pc));
-       residency = xe_gt_idle_residency_msec(gtidle);
-       xe_pm_runtime_put(pc_to_xe(pc));
+       scoped_guard(xe_pm_runtime, pc_to_xe(pc))
+               residency = xe_gt_idle_residency_msec(gtidle);
 
        return sysfs_emit(buff, "%llu\n", residency);
 }
@@ -396,21 +383,17 @@ void xe_gt_idle_enable_c6(struct xe_gt *gt)
 
 int xe_gt_idle_disable_c6(struct xe_gt *gt)
 {
-       unsigned int fw_ref;
-
        xe_device_assert_mem_access(gt_to_xe(gt));
 
        if (IS_SRIOV_VF(gt_to_xe(gt)))
                return 0;
 
-       fw_ref = xe_force_wake_get(gt_to_fw(gt), XE_FW_GT);
-       if (!fw_ref)
+       CLASS(xe_force_wake, fw_ref)(gt_to_fw(gt), XE_FW_GT);
+       if (!fw_ref.domains)
                return -ETIMEDOUT;
 
        xe_mmio_write32(&gt->mmio, RC_CONTROL, 0);
        xe_mmio_write32(&gt->mmio, RC_STATE, 0);
 
-       xe_force_wake_put(gt_to_fw(gt), fw_ref);
-
        return 0;
 }