mirror of
https://github.com/torvalds/linux.git
synced 2026-05-26 16:12:59 +02:00
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>
This commit is contained in:
parent
ef4a4b8781
commit
1bc9d39275
|
|
@ -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);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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 @@ 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);
|
||||
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;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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 */
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
|
|
|||
|
|
@ -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 @@ int radeon_driver_open_kms(struct drm_device *dev, struct drm_file *file_priv)
|
|||
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);
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user