| From 4a2db36cf7f6143e628314f2ec9d94f92618dc6d Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Sat, 13 Jun 2020 21:21:22 -0500 |
| Subject: drm/radeon: Fix reference count leaks caused by pm_runtime_get_sync |
| |
| From: Aditya Pakki <pakki001@umn.edu> |
| |
| [ Upstream commit 9fb10671011143d15b6b40d6d5fa9c52c57e9d63 ] |
| |
| 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: Evan Quan <evan.quan@amd.com> |
| Signed-off-by: Aditya Pakki <pakki001@umn.edu> |
| Signed-off-by: Alex Deucher <alexander.deucher@amd.com> |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| drivers/gpu/drm/radeon/radeon_display.c | 4 +++- |
| drivers/gpu/drm/radeon/radeon_drv.c | 4 +++- |
| drivers/gpu/drm/radeon/radeon_kms.c | 4 +++- |
| 3 files changed, 9 insertions(+), 3 deletions(-) |
| |
| diff --git a/drivers/gpu/drm/radeon/radeon_display.c b/drivers/gpu/drm/radeon/radeon_display.c |
| index 35db79a168bf7..df1a7eb736517 100644 |
| --- a/drivers/gpu/drm/radeon/radeon_display.c |
| +++ b/drivers/gpu/drm/radeon/radeon_display.c |
| @@ -635,8 +635,10 @@ radeon_crtc_set_config(struct drm_mode_set *set, |
| dev = set->crtc->dev; |
| |
| ret = pm_runtime_get_sync(dev->dev); |
| - if (ret < 0) |
| + if (ret < 0) { |
| + pm_runtime_put_autosuspend(dev->dev); |
| return ret; |
| + } |
| |
| ret = drm_crtc_helper_set_config(set, ctx); |
| |
| diff --git a/drivers/gpu/drm/radeon/radeon_drv.c b/drivers/gpu/drm/radeon/radeon_drv.c |
| index 59f8186a24151..0cf0b00a0623e 100644 |
| --- a/drivers/gpu/drm/radeon/radeon_drv.c |
| +++ b/drivers/gpu/drm/radeon/radeon_drv.c |
| @@ -549,8 +549,10 @@ long radeon_drm_ioctl(struct file *filp, |
| long ret; |
| dev = file_priv->minor->dev; |
| ret = pm_runtime_get_sync(dev->dev); |
| - if (ret < 0) |
| + if (ret < 0) { |
| + pm_runtime_put_autosuspend(dev->dev); |
| return ret; |
| + } |
| |
| ret = drm_ioctl(filp, cmd, arg); |
| |
| diff --git a/drivers/gpu/drm/radeon/radeon_kms.c b/drivers/gpu/drm/radeon/radeon_kms.c |
| index 58176db85952c..779e4cd86245d 100644 |
| --- a/drivers/gpu/drm/radeon/radeon_kms.c |
| +++ b/drivers/gpu/drm/radeon/radeon_kms.c |
| @@ -638,8 +638,10 @@ int radeon_driver_open_kms(struct drm_device *dev, struct drm_file *file_priv) |
| file_priv->driver_priv = NULL; |
| |
| r = pm_runtime_get_sync(dev->dev); |
| - if (r < 0) |
| + if (r < 0) { |
| + pm_runtime_put_autosuspend(dev->dev); |
| return r; |
| + } |
| |
| /* new gpu have virtual address space support */ |
| if (rdev->family >= CHIP_CAYMAN) { |
| -- |
| 2.25.1 |
| |