Commit 0ba1cb62 authored by Aditya Pakki's avatar Aditya Pakki Committed by Greg Kroah-Hartman

drm/radeon: Fix reference count leaks caused by pm_runtime_get_sync

[ Upstream commit 9fb10671 ]

On calling pm_runtime_get_sync() the reference count of the device
is incremented. In case of failure, decrement the
reference count before returning the error.
Acked-by: default avatarEvan Quan <evan.quan@amd.com>
Signed-off-by: default avatarAditya Pakki <pakki001@umn.edu>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent fc043bd9
...@@ -639,8 +639,10 @@ radeon_crtc_set_config(struct drm_mode_set *set) ...@@ -639,8 +639,10 @@ radeon_crtc_set_config(struct drm_mode_set *set)
dev = set->crtc->dev; dev = set->crtc->dev;
ret = pm_runtime_get_sync(dev->dev); ret = pm_runtime_get_sync(dev->dev);
if (ret < 0) if (ret < 0) {
pm_runtime_put_autosuspend(dev->dev);
return ret; return ret;
}
ret = drm_crtc_helper_set_config(set); ret = drm_crtc_helper_set_config(set);
......
...@@ -496,8 +496,10 @@ long radeon_drm_ioctl(struct file *filp, ...@@ -496,8 +496,10 @@ long radeon_drm_ioctl(struct file *filp,
long ret; long ret;
dev = file_priv->minor->dev; dev = file_priv->minor->dev;
ret = pm_runtime_get_sync(dev->dev); ret = pm_runtime_get_sync(dev->dev);
if (ret < 0) if (ret < 0) {
pm_runtime_put_autosuspend(dev->dev);
return ret; return ret;
}
ret = drm_ioctl(filp, cmd, arg); ret = drm_ioctl(filp, cmd, arg);
......
...@@ -634,8 +634,10 @@ int radeon_driver_open_kms(struct drm_device *dev, struct drm_file *file_priv) ...@@ -634,8 +634,10 @@ int radeon_driver_open_kms(struct drm_device *dev, struct drm_file *file_priv)
file_priv->driver_priv = NULL; file_priv->driver_priv = NULL;
r = pm_runtime_get_sync(dev->dev); r = pm_runtime_get_sync(dev->dev);
if (r < 0) if (r < 0) {
pm_runtime_put_autosuspend(dev->dev);
return r; return r;
}
/* new gpu have virtual address space support */ /* new gpu have virtual address space support */
if (rdev->family >= CHIP_CAYMAN) { if (rdev->family >= CHIP_CAYMAN) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment