drm/radeon: Remove redundant pm_runtime_mark_last_busy() calls

pm_runtime_put_autosuspend(), pm_runtime_put_sync_autosuspend(),
pm_runtime_autosuspend() and pm_request_autosuspend() now include a call
to pm_runtime_mark_last_busy(). Remove the now-redundant explicit call to
pm_runtime_mark_last_busy().

Acked-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

diff --git a/drivers/gpu/drm/radeon/radeon_acpi.c b/drivers/gpu/drm/radeon/radeon_acpi.c
index 22ce61bdfc060309a4d059eef01bd99a47dea996..08f8ba4fd148138521b84c408e6c215b59c60857 100644 (file)
--- a/drivers/gpu/drm/radeon/radeon_acpi.c
+++ b/drivers/gpu/drm/radeon/radeon_acpi.c
@@ -408,7 +408,6 @@ static int radeon_atif_handler(struct radeon_device *rdev,
                        pm_runtime_get_sync(rdev_to_drm(rdev)->dev);
                        /* 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);
                }
        }

diff --git a/drivers/gpu/drm/radeon/radeon_connectors.c b/drivers/gpu/drm/radeon/radeon_connectors.c
index 9f6a3df951baba2b545a9880128ed214feeb81ff..012d8b2295b8bd2b07ecfc3422efffc64809f541 100644 (file)
--- a/drivers/gpu/drm/radeon/radeon_connectors.c
+++ b/drivers/gpu/drm/radeon/radeon_connectors.c
@@ -875,10 +875,8 @@ radeon_lvds_detect(struct drm_connector *connector, bool force)
 
        radeon_connector_update_scratch_regs(connector, ret);
 
-       if (!drm_kms_helper_is_poll_worker()) {
-               pm_runtime_mark_last_busy(connector->dev->dev);
+       if (!drm_kms_helper_is_poll_worker())
                pm_runtime_put_autosuspend(connector->dev->dev);
-       }
 
        return ret;
 }
@@ -1066,10 +1064,8 @@ radeon_vga_detect(struct drm_connector *connector, bool force)
        radeon_connector_update_scratch_regs(connector, ret);
 
 out:
-       if (!drm_kms_helper_is_poll_worker()) {
-               pm_runtime_mark_last_busy(connector->dev->dev);
+       if (!drm_kms_helper_is_poll_worker())
                pm_runtime_put_autosuspend(connector->dev->dev);
-       }
 
        return ret;
 }
@@ -1154,10 +1150,8 @@ radeon_tv_detect(struct drm_connector *connector, bool force)
                ret = radeon_connector_analog_encoder_conflict_solve(connector, encoder, ret, false);
        radeon_connector_update_scratch_regs(connector, ret);
 
-       if (!drm_kms_helper_is_poll_worker()) {
-               pm_runtime_mark_last_busy(connector->dev->dev);
+       if (!drm_kms_helper_is_poll_worker())
                pm_runtime_put_autosuspend(connector->dev->dev);
-       }
 
        return ret;
 }
@@ -1402,10 +1396,8 @@ out:
        }
 
 exit:
-       if (!drm_kms_helper_is_poll_worker()) {
-               pm_runtime_mark_last_busy(connector->dev->dev);
+       if (!drm_kms_helper_is_poll_worker())
                pm_runtime_put_autosuspend(connector->dev->dev);
-       }
 
        return ret;
 }
@@ -1714,10 +1706,8 @@ 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);
+       if (!drm_kms_helper_is_poll_worker())
                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 351b9dfcdad8f0522236dec1118ead5fe08217fa..35fb99bcd9a7f67b74f2de432952f5bb02028853 100644 (file)
--- a/drivers/gpu/drm/radeon/radeon_display.c
+++ b/drivers/gpu/drm/radeon/radeon_display.c
@@ -644,8 +644,6 @@ radeon_crtc_set_config(struct drm_mode_set *set,
                if (crtc->enabled)
                        active = true;
 
-       pm_runtime_mark_last_busy(dev->dev);
-
        rdev = dev->dev_private;
        /* if we have active crtcs and we don't have a power ref,
           take the current one */

diff --git a/drivers/gpu/drm/radeon/radeon_drv.c b/drivers/gpu/drm/radeon/radeon_drv.c
index 350f88af888d5a59894e73967497ddf6af660908..26ad9adc5d8c18e4be9b88809b25341a3625d451 100644 (file)
--- a/drivers/gpu/drm/radeon/radeon_drv.c
+++ b/drivers/gpu/drm/radeon/radeon_drv.c
@@ -462,7 +462,6 @@ static int radeon_pmops_runtime_idle(struct device *dev)
                }
        }
 
-       pm_runtime_mark_last_busy(dev);
        pm_runtime_autosuspend(dev);
        /* we don't want the main rpm_idle to call suspend - we want to autosuspend */
        return 1;
@@ -484,7 +483,6 @@ long radeon_drm_ioctl(struct file *filp,
 
        ret = drm_ioctl(filp, cmd, arg);
 
-       pm_runtime_mark_last_busy(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 dc81b0c2dbff3fdf4f95d4b85865dbdc102a6c09..4734dbd79c60a6b31d77a8d11ace27b0a1ef0479 100644 (file)
--- a/drivers/gpu/drm/radeon/radeon_fbdev.c
+++ b/drivers/gpu/drm/radeon/radeon_fbdev.c
@@ -154,7 +154,6 @@ static int radeon_fbdev_fb_open(struct fb_info *info, int user)
        return 0;
 
 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);
        return ret;
 }
@@ -164,7 +163,6 @@ static int radeon_fbdev_fb_release(struct fb_info *info, int user)
        struct drm_fb_helper *fb_helper = info->par;
        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);
 
        return 0;

diff --git a/drivers/gpu/drm/radeon/radeon_kms.c b/drivers/gpu/drm/radeon/radeon_kms.c
index ba1446acd7032434785b259c77419752a2c5fc46..7cbe02ffb193c78ec66db8740e2110b5298182fa 100644 (file)
--- a/drivers/gpu/drm/radeon/radeon_kms.c
+++ b/drivers/gpu/drm/radeon/radeon_kms.c
@@ -169,7 +169,6 @@ int radeon_driver_load_kms(struct drm_device *dev, unsigned long flags)
                pm_runtime_set_autosuspend_delay(dev->dev, 5000);
                pm_runtime_set_active(dev->dev);
                pm_runtime_allow(dev->dev);
-               pm_runtime_mark_last_busy(dev->dev);
                pm_runtime_put_autosuspend(dev->dev);
        }
 
@@ -676,7 +675,6 @@ int radeon_driver_open_kms(struct drm_device *dev, struct drm_file *file_priv)
                file_priv->driver_priv = fpriv;
        }
 
-       pm_runtime_mark_last_busy(dev->dev);
        pm_runtime_put_autosuspend(dev->dev);
        return 0;
 
@@ -686,7 +684,6 @@ err_fpriv:
        kfree(fpriv);
 
 err_suspend:
-       pm_runtime_mark_last_busy(dev->dev);
        pm_runtime_put_autosuspend(dev->dev);
        return r;
 }
@@ -736,7 +733,6 @@ void radeon_driver_postclose_kms(struct drm_device *dev,
                kfree(fpriv);
                file_priv->driver_priv = NULL;
        }
-       pm_runtime_mark_last_busy(dev->dev);
        pm_runtime_put_autosuspend(dev->dev);
 }