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@xxxxxxxxxxxxxxx>
---
drivers/gpu/drm/radeon/radeon_acpi.c | 2 +-
drivers/gpu/drm/radeon/radeon_connectors.c | 20 ++++++++++----------
drivers/gpu/drm/radeon/radeon_display.c | 6 +++---
drivers/gpu/drm/radeon/radeon_drv.c | 4 ++--
drivers/gpu/drm/radeon/radeon_fbdev.c | 4 ++--
drivers/gpu/drm/radeon/radeon_kms.c | 10 +++++-----
6 files changed, 23 insertions(+), 23 deletions(-)
diff --git a/drivers/gpu/drm/radeon/radeon_acpi.c b/drivers/gpu/drm/radeon/radeon_acpi.c
index 22ce61bdfc06..92721df2e43c 100644
--- a/drivers/gpu/drm/radeon/radeon_acpi.c
+++ b/drivers/gpu/drm/radeon/radeon_acpi.c
@@ -409,7 +409,7 @@ static int radeon_atif_handler(struct radeon_device *rdev,
/* Just fire off a uevent and let userspace tell us what to do */
drm_helper_hpd_irq_event(rdev_to_drm(rdev));
pm_runtime_mark_last_busy(rdev_to_drm(rdev)->dev);
- pm_runtime_put_autosuspend(rdev_to_drm(rdev)->dev);
+ __pm_runtime_put_autosuspend(rdev_to_drm(rdev)->dev);
}
}
/* TODO: check other events */
diff --git a/drivers/gpu/drm/radeon/radeon_connectors.c b/drivers/gpu/drm/radeon/radeon_connectors.c
index 528a8f3677c2..d6c58af369e5 100644
--- a/drivers/gpu/drm/radeon/radeon_connectors.c
+++ b/drivers/gpu/drm/radeon/radeon_connectors.c
@@ -848,7 +848,7 @@ radeon_lvds_detect(struct drm_connector *connector, bool force)
if (!drm_kms_helper_is_poll_worker()) {
r = pm_runtime_get_sync(connector->dev->dev);
if (r < 0) {
- pm_runtime_put_autosuspend(connector->dev->dev);
+ __pm_runtime_put_autosuspend(connector->dev->dev);
return connector_status_disconnected;
}
}
@@ -877,7 +877,7 @@ radeon_lvds_detect(struct drm_connector *connector, bool force)
if (!drm_kms_helper_is_poll_worker()) {
pm_runtime_mark_last_busy(connector->dev->dev);
- pm_runtime_put_autosuspend(connector->dev->dev);
+ __pm_runtime_put_autosuspend(connector->dev->dev);
}
return ret;
@@ -996,7 +996,7 @@ radeon_vga_detect(struct drm_connector *connector, bool force)
if (!drm_kms_helper_is_poll_worker()) {
r = pm_runtime_get_sync(connector->dev->dev);
if (r < 0) {
- pm_runtime_put_autosuspend(connector->dev->dev);
+ __pm_runtime_put_autosuspend(connector->dev->dev);
return connector_status_disconnected;
}
}
@@ -1068,7 +1068,7 @@ radeon_vga_detect(struct drm_connector *connector, bool force)
out:
if (!drm_kms_helper_is_poll_worker()) {
pm_runtime_mark_last_busy(connector->dev->dev);
- pm_runtime_put_autosuspend(connector->dev->dev);
+ __pm_runtime_put_autosuspend(connector->dev->dev);
}
return ret;
@@ -1138,7 +1138,7 @@ radeon_tv_detect(struct drm_connector *connector, bool force)
if (!drm_kms_helper_is_poll_worker()) {
r = pm_runtime_get_sync(connector->dev->dev);
if (r < 0) {
- pm_runtime_put_autosuspend(connector->dev->dev);
+ __pm_runtime_put_autosuspend(connector->dev->dev);
return connector_status_disconnected;
}
}
@@ -1156,7 +1156,7 @@ radeon_tv_detect(struct drm_connector *connector, bool force)
if (!drm_kms_helper_is_poll_worker()) {
pm_runtime_mark_last_busy(connector->dev->dev);
- pm_runtime_put_autosuspend(connector->dev->dev);
+ __pm_runtime_put_autosuspend(connector->dev->dev);
}
return ret;
@@ -1224,7 +1224,7 @@ radeon_dvi_detect(struct drm_connector *connector, bool force)
if (!drm_kms_helper_is_poll_worker()) {
r = pm_runtime_get_sync(connector->dev->dev);
if (r < 0) {
- pm_runtime_put_autosuspend(connector->dev->dev);
+ __pm_runtime_put_autosuspend(connector->dev->dev);
return connector_status_disconnected;
}
}
@@ -1414,7 +1414,7 @@ radeon_dvi_detect(struct drm_connector *connector, bool force)
exit:
if (!drm_kms_helper_is_poll_worker()) {
pm_runtime_mark_last_busy(connector->dev->dev);
- pm_runtime_put_autosuspend(connector->dev->dev);
+ __pm_runtime_put_autosuspend(connector->dev->dev);
}
return ret;
@@ -1643,7 +1643,7 @@ radeon_dp_detect(struct drm_connector *connector, bool force)
if (!drm_kms_helper_is_poll_worker()) {
r = pm_runtime_get_sync(connector->dev->dev);
if (r < 0) {
- pm_runtime_put_autosuspend(connector->dev->dev);
+ __pm_runtime_put_autosuspend(connector->dev->dev);
return connector_status_disconnected;
}
}
@@ -1726,7 +1726,7 @@ radeon_dp_detect(struct drm_connector *connector, bool force)
out:
if (!drm_kms_helper_is_poll_worker()) {
pm_runtime_mark_last_busy(connector->dev->dev);
- pm_runtime_put_autosuspend(connector->dev->dev);
+ __pm_runtime_put_autosuspend(connector->dev->dev);
}
return ret;
diff --git a/drivers/gpu/drm/radeon/radeon_display.c b/drivers/gpu/drm/radeon/radeon_display.c
index 8f5f8abcb1b4..3fe641bad5bc 100644
--- a/drivers/gpu/drm/radeon/radeon_display.c
+++ b/drivers/gpu/drm/radeon/radeon_display.c
@@ -634,7 +634,7 @@ radeon_crtc_set_config(struct drm_mode_set *set,
ret = pm_runtime_get_sync(dev->dev);
if (ret < 0) {
- pm_runtime_put_autosuspend(dev->dev);
+ __pm_runtime_put_autosuspend(dev->dev);
return ret;
}
@@ -656,12 +656,12 @@ radeon_crtc_set_config(struct drm_mode_set *set,
/* if we have no active crtcs, then drop the power ref
we got before */
if (!active && rdev->have_disp_power_ref) {
- pm_runtime_put_autosuspend(dev->dev);
+ __pm_runtime_put_autosuspend(dev->dev);
rdev->have_disp_power_ref = false;
}
/* drop the power reference we got coming in here */
- pm_runtime_put_autosuspend(dev->dev);
+ __pm_runtime_put_autosuspend(dev->dev);
return ret;
}
diff --git a/drivers/gpu/drm/radeon/radeon_drv.c b/drivers/gpu/drm/radeon/radeon_drv.c
index 900b05d8aa5c..ad4431a60508 100644
--- a/drivers/gpu/drm/radeon/radeon_drv.c
+++ b/drivers/gpu/drm/radeon/radeon_drv.c
@@ -494,14 +494,14 @@ long radeon_drm_ioctl(struct file *filp,
dev = file_priv->minor->dev;
ret = pm_runtime_get_sync(dev->dev);
if (ret < 0) {
- pm_runtime_put_autosuspend(dev->dev);
+ __pm_runtime_put_autosuspend(dev->dev);
return ret;
}
ret = drm_ioctl(filp, cmd, arg);
pm_runtime_mark_last_busy(dev->dev);
- pm_runtime_put_autosuspend(dev->dev);
+ __pm_runtime_put_autosuspend(dev->dev);
return ret;
}
diff --git a/drivers/gpu/drm/radeon/radeon_fbdev.c b/drivers/gpu/drm/radeon/radeon_fbdev.c
index 0aa20c8df546..a302cd3dc8a3 100644
--- a/drivers/gpu/drm/radeon/radeon_fbdev.c
+++ b/drivers/gpu/drm/radeon/radeon_fbdev.c
@@ -156,7 +156,7 @@ static int radeon_fbdev_fb_open(struct fb_info *info, int user)
err_pm_runtime_mark_last_busy:
pm_runtime_mark_last_busy(rdev_to_drm(rdev)->dev);
- pm_runtime_put_autosuspend(rdev_to_drm(rdev)->dev);
+ __pm_runtime_put_autosuspend(rdev_to_drm(rdev)->dev);
return ret;
}
@@ -166,7 +166,7 @@ static int radeon_fbdev_fb_release(struct fb_info *info, int user)
struct radeon_device *rdev = fb_helper->dev->dev_private;
pm_runtime_mark_last_busy(rdev_to_drm(rdev)->dev);
- pm_runtime_put_autosuspend(rdev_to_drm(rdev)->dev);
+ __pm_runtime_put_autosuspend(rdev_to_drm(rdev)->dev);
return 0;
}
diff --git a/drivers/gpu/drm/radeon/radeon_kms.c b/drivers/gpu/drm/radeon/radeon_kms.c
index 645e33bf7947..265912c96232 100644
--- a/drivers/gpu/drm/radeon/radeon_kms.c
+++ b/drivers/gpu/drm/radeon/radeon_kms.c
@@ -171,7 +171,7 @@ int radeon_driver_load_kms(struct drm_device *dev, unsigned long flags)
pm_runtime_set_active(dev->dev);
pm_runtime_allow(dev->dev);
pm_runtime_mark_last_busy(dev->dev);
- pm_runtime_put_autosuspend(dev->dev);
+ __pm_runtime_put_autosuspend(dev->dev);
}
out:
@@ -635,7 +635,7 @@ int radeon_driver_open_kms(struct drm_device *dev, struct drm_file *file_priv)
r = pm_runtime_get_sync(dev->dev);
if (r < 0) {
- pm_runtime_put_autosuspend(dev->dev);
+ __pm_runtime_put_autosuspend(dev->dev);
return r;
}
@@ -678,7 +678,7 @@ int radeon_driver_open_kms(struct drm_device *dev, struct drm_file *file_priv)
}
pm_runtime_mark_last_busy(dev->dev);
- pm_runtime_put_autosuspend(dev->dev);
+ __pm_runtime_put_autosuspend(dev->dev);
return 0;
err_vm_fini:
@@ -688,7 +688,7 @@ int radeon_driver_open_kms(struct drm_device *dev, struct drm_file *file_priv)
err_suspend:
pm_runtime_mark_last_busy(dev->dev);
- pm_runtime_put_autosuspend(dev->dev);
+ __pm_runtime_put_autosuspend(dev->dev);
return r;
}
@@ -738,7 +738,7 @@ void radeon_driver_postclose_kms(struct drm_device *dev,
file_priv->driver_priv = NULL;
}
pm_runtime_mark_last_busy(dev->dev);
- pm_runtime_put_autosuspend(dev->dev);
+ __pm_runtime_put_autosuspend(dev->dev);
}
/*
--
2.39.5
