Re: [PATCH v2 27/30] drm/xe/sriov: Use scope-based runtime PM

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

Quoting Matt Roper (2025-11-10 20:20:45-03:00)
>Use scope-based runtime power management in the SRIOV code for
>consistency with other parts of the driver.
>
>Signed-off-by: Matt Roper <matthew.d.roper@intel.com>

I think we can drop variable ret in functions:

* xe_pci_sriov_configure()
* xe_sriov_dev_attr_store()
* xe_sriov_vf_attr_store()

With that,

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

>---
> drivers/gpu/drm/xe/xe_pci_sriov.c             | 3 +--
> drivers/gpu/drm/xe/xe_sriov_pf_debugfs.c      | 6 ++----
> drivers/gpu/drm/xe/xe_sriov_pf_sysfs.c        | 6 ++----
> drivers/gpu/drm/xe/xe_sriov_vf_ccs.c          | 5 +----
> drivers/gpu/drm/xe/xe_tile_sriov_pf_debugfs.c | 3 +--
> 5 files changed, 7 insertions(+), 16 deletions(-)
>
>diff --git a/drivers/gpu/drm/xe/xe_pci_sriov.c b/drivers/gpu/drm/xe/xe_pci_sriov.c
>index d0fcde66a774..4b16748fe2ed 100644
>--- a/drivers/gpu/drm/xe/xe_pci_sriov.c
>+++ b/drivers/gpu/drm/xe/xe_pci_sriov.c
>@@ -212,12 +212,11 @@ int xe_pci_sriov_configure(struct pci_dev *pdev, int num_vfs)
>         if (num_vfs && pci_num_vf(pdev))
>                 return -EBUSY;
> 
>-        xe_pm_runtime_get(xe);
>+        guard(xe_pm_runtime)(xe);
>         if (num_vfs > 0)
>                 ret = pf_enable_vfs(xe, num_vfs);
>         else
>                 ret = pf_disable_vfs(xe);
>-        xe_pm_runtime_put(xe);
> 
>         return ret;
> }
>diff --git a/drivers/gpu/drm/xe/xe_sriov_pf_debugfs.c b/drivers/gpu/drm/xe/xe_sriov_pf_debugfs.c
>index a81aa05c5532..21eafe333cb5 100644
>--- a/drivers/gpu/drm/xe/xe_sriov_pf_debugfs.c
>+++ b/drivers/gpu/drm/xe/xe_sriov_pf_debugfs.c
>@@ -69,9 +69,8 @@ static ssize_t from_file_write_to_xe_call(struct file *file, const char __user *
>         if (ret < 0)
>                 return ret;
>         if (yes) {
>-                xe_pm_runtime_get(xe);
>+                guard(xe_pm_runtime)(xe);
>                 ret = call(xe);
>-                xe_pm_runtime_put(xe);
>         }
>         if (ret < 0)
>                 return ret;
>@@ -157,9 +156,8 @@ static ssize_t from_file_write_to_vf_call(struct file *file, const char __user *
>         if (ret < 0)
>                 return ret;
>         if (yes) {
>-                xe_pm_runtime_get(xe);
>+                guard(xe_pm_runtime)(xe);
>                 ret = call(xe, vfid);
>-                xe_pm_runtime_put(xe);
>         }
>         if (ret < 0)
>                 return ret;
>diff --git a/drivers/gpu/drm/xe/xe_sriov_pf_sysfs.c b/drivers/gpu/drm/xe/xe_sriov_pf_sysfs.c
>index c0b767ac735c..f0777976335c 100644
>--- a/drivers/gpu/drm/xe/xe_sriov_pf_sysfs.c
>+++ b/drivers/gpu/drm/xe/xe_sriov_pf_sysfs.c
>@@ -394,9 +394,8 @@ static ssize_t xe_sriov_dev_attr_store(struct kobject *kobj, struct attribute *a
>         if (!vattr->store)
>                 return -EPERM;
> 
>-        xe_pm_runtime_get(xe);
>+        guard(xe_pm_runtime)(xe);
>         ret = xe_sriov_pf_wait_ready(xe) ?: vattr->store(xe, buf, count);
>-        xe_pm_runtime_put(xe);
> 
>         return ret;
> }
>@@ -430,9 +429,8 @@ static ssize_t xe_sriov_vf_attr_store(struct kobject *kobj, struct attribute *at
>         if (!vattr->store)
>                 return -EPERM;
> 
>-        xe_pm_runtime_get(xe);
>+        guard(xe_pm_runtime)(xe);
>         ret = xe_sriov_pf_wait_ready(xe) ?: vattr->store(xe, vfid, buf, count);
>-        xe_pm_runtime_get(xe);
> 
>         return ret;
> }
>diff --git a/drivers/gpu/drm/xe/xe_sriov_vf_ccs.c b/drivers/gpu/drm/xe/xe_sriov_vf_ccs.c
>index 797a4b866226..e1cdc46ad710 100644
>--- a/drivers/gpu/drm/xe/xe_sriov_vf_ccs.c
>+++ b/drivers/gpu/drm/xe/xe_sriov_vf_ccs.c
>@@ -463,8 +463,7 @@ void xe_sriov_vf_ccs_print(struct xe_device *xe, struct drm_printer *p)
>         if (!IS_VF_CCS_READY(xe))
>                 return;
> 
>-        xe_pm_runtime_get(xe);
>-
>+        guard(xe_pm_runtime)(xe);
>         for_each_ccs_rw_ctx(ctx_id) {
>                 bb_pool = xe->sriov.vf.ccs.contexts[ctx_id].mem.ccs_bb_pool;
>                 if (!bb_pool)
>@@ -475,6 +474,4 @@ void xe_sriov_vf_ccs_print(struct xe_device *xe, struct drm_printer *p)
>                 drm_suballoc_dump_debug_info(&bb_pool->base, p, xe_sa_manager_gpu_addr(bb_pool));
>                 drm_puts(p, "\n");
>         }
>-
>-        xe_pm_runtime_put(xe);
> }
>diff --git a/drivers/gpu/drm/xe/xe_tile_sriov_pf_debugfs.c b/drivers/gpu/drm/xe/xe_tile_sriov_pf_debugfs.c
>index f3f478f14ff5..7f97db2f89bb 100644
>--- a/drivers/gpu/drm/xe/xe_tile_sriov_pf_debugfs.c
>+++ b/drivers/gpu/drm/xe/xe_tile_sriov_pf_debugfs.c
>@@ -141,12 +141,11 @@ static int NAME##_set(void *data, u64 val)                                        \
>         if (val > (TYPE)~0ull)                                                        \
>                 return -EOVERFLOW;                                                \
>                                                                                 \
>-        xe_pm_runtime_get(xe);                                                        \
>+        guard(xe_pm_runtime)(xe);                                                \
>         err = xe_sriov_pf_wait_ready(xe) ?:                                        \
>               xe_gt_sriov_pf_config_set_##CONFIG(gt, vfid, val);                \
>         if (!err)                                                                \
>                 xe_sriov_pf_provision_set_custom_mode(xe);                        \
>-        xe_pm_runtime_put(xe);                                                        \
>                                                                                 \
>         return err;                                                                \
> }                                                                                \
>-- 
>2.51.1
>