| Message ID | 20241004094111.113368-1-sakari.ailus@linux.intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | treewide: Switch to __pm_runtime_put_autosuspend() | expand |
Reviewed-by: Jacek Lawrynowicz <jacek.lawrynowicz@linux.intel.com> On 10/4/2024 11:41 AM, Sakari Ailus wrote: > pm_runtime_put_autosuspend() will soon be changed to include a call to > pm_runtime_mark_last_busy(). This patch switches the current users to > __pm_runtime_put_autosuspend() which will continue to have the > functionality of old pm_runtime_put_autosuspend(). > > Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com> > --- > drivers/accel/ivpu/ivpu_drv.c | 2 +- > drivers/accel/ivpu/ivpu_pm.c | 8 ++++---- > 2 files changed, 5 insertions(+), 5 deletions(-) > > diff --git a/drivers/accel/ivpu/ivpu_drv.c b/drivers/accel/ivpu/ivpu_drv.c > index c91400ecf926..4140ff55a4e6 100644 > --- a/drivers/accel/ivpu/ivpu_drv.c > +++ b/drivers/accel/ivpu/ivpu_drv.c > @@ -104,7 +104,7 @@ static void file_priv_release(struct kref *ref) > mutex_lock(&vdev->context_list_lock); > file_priv_unbind(vdev, file_priv); > mutex_unlock(&vdev->context_list_lock); > - pm_runtime_put_autosuspend(vdev->drm.dev); > + __pm_runtime_put_autosuspend(vdev->drm.dev); > > mutex_destroy(&file_priv->ms_lock); > mutex_destroy(&file_priv->lock); > diff --git a/drivers/accel/ivpu/ivpu_pm.c b/drivers/accel/ivpu/ivpu_pm.c > index 59d3170f5e35..643854e51fa0 100644 > --- a/drivers/accel/ivpu/ivpu_pm.c > +++ b/drivers/accel/ivpu/ivpu_pm.c > @@ -143,7 +143,7 @@ static void ivpu_pm_recovery_work(struct work_struct *work) > > kobject_uevent_env(&vdev->drm.dev->kobj, KOBJ_CHANGE, evt); > pm_runtime_mark_last_busy(vdev->drm.dev); > - pm_runtime_put_autosuspend(vdev->drm.dev); > + __pm_runtime_put_autosuspend(vdev->drm.dev); > } > > void ivpu_pm_trigger_recovery(struct ivpu_device *vdev, const char *reason) > @@ -303,7 +303,7 @@ int ivpu_rpm_get(struct ivpu_device *vdev) > void ivpu_rpm_put(struct ivpu_device *vdev) > { > pm_runtime_mark_last_busy(vdev->drm.dev); > - pm_runtime_put_autosuspend(vdev->drm.dev); > + __pm_runtime_put_autosuspend(vdev->drm.dev); > } > > void ivpu_pm_reset_prepare_cb(struct pci_dev *pdev) > @@ -339,7 +339,7 @@ void ivpu_pm_reset_done_cb(struct pci_dev *pdev) > ivpu_dbg(vdev, PM, "Post-reset done.\n"); > > pm_runtime_mark_last_busy(vdev->drm.dev); > - pm_runtime_put_autosuspend(vdev->drm.dev); > + __pm_runtime_put_autosuspend(vdev->drm.dev); > } > > void ivpu_pm_init(struct ivpu_device *vdev) > @@ -381,7 +381,7 @@ void ivpu_pm_enable(struct ivpu_device *vdev) > pm_runtime_set_active(dev); > pm_runtime_allow(dev); > pm_runtime_mark_last_busy(dev); > - pm_runtime_put_autosuspend(dev); > + __pm_runtime_put_autosuspend(dev); > } > > void ivpu_pm_disable(struct ivpu_device *vdev)
diff --git a/drivers/accel/ivpu/ivpu_drv.c b/drivers/accel/ivpu/ivpu_drv.c index c91400ecf926..4140ff55a4e6 100644 --- a/drivers/accel/ivpu/ivpu_drv.c +++ b/drivers/accel/ivpu/ivpu_drv.c @@ -104,7 +104,7 @@ static void file_priv_release(struct kref *ref) mutex_lock(&vdev->context_list_lock); file_priv_unbind(vdev, file_priv); mutex_unlock(&vdev->context_list_lock); - pm_runtime_put_autosuspend(vdev->drm.dev); + __pm_runtime_put_autosuspend(vdev->drm.dev); mutex_destroy(&file_priv->ms_lock); mutex_destroy(&file_priv->lock); diff --git a/drivers/accel/ivpu/ivpu_pm.c b/drivers/accel/ivpu/ivpu_pm.c index 59d3170f5e35..643854e51fa0 100644 --- a/drivers/accel/ivpu/ivpu_pm.c +++ b/drivers/accel/ivpu/ivpu_pm.c @@ -143,7 +143,7 @@ static void ivpu_pm_recovery_work(struct work_struct *work) kobject_uevent_env(&vdev->drm.dev->kobj, KOBJ_CHANGE, evt); pm_runtime_mark_last_busy(vdev->drm.dev); - pm_runtime_put_autosuspend(vdev->drm.dev); + __pm_runtime_put_autosuspend(vdev->drm.dev); } void ivpu_pm_trigger_recovery(struct ivpu_device *vdev, const char *reason) @@ -303,7 +303,7 @@ int ivpu_rpm_get(struct ivpu_device *vdev) void ivpu_rpm_put(struct ivpu_device *vdev) { pm_runtime_mark_last_busy(vdev->drm.dev); - pm_runtime_put_autosuspend(vdev->drm.dev); + __pm_runtime_put_autosuspend(vdev->drm.dev); } void ivpu_pm_reset_prepare_cb(struct pci_dev *pdev) @@ -339,7 +339,7 @@ void ivpu_pm_reset_done_cb(struct pci_dev *pdev) ivpu_dbg(vdev, PM, "Post-reset done.\n"); pm_runtime_mark_last_busy(vdev->drm.dev); - pm_runtime_put_autosuspend(vdev->drm.dev); + __pm_runtime_put_autosuspend(vdev->drm.dev); } void ivpu_pm_init(struct ivpu_device *vdev) @@ -381,7 +381,7 @@ void ivpu_pm_enable(struct ivpu_device *vdev) pm_runtime_set_active(dev); pm_runtime_allow(dev); pm_runtime_mark_last_busy(dev); - pm_runtime_put_autosuspend(dev); + __pm_runtime_put_autosuspend(dev); } void ivpu_pm_disable(struct ivpu_device *vdev)
pm_runtime_put_autosuspend() will soon be changed to include a call to pm_runtime_mark_last_busy(). This patch switches the current users to __pm_runtime_put_autosuspend() which will continue to have the functionality of old pm_runtime_put_autosuspend(). Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com> --- drivers/accel/ivpu/ivpu_drv.c | 2 +- drivers/accel/ivpu/ivpu_pm.c | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-)