| From d3b13ae6f003682f06c9a6f6efc07c373315e234 Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Sat, 13 Jun 2020 20:55:39 -0500 |
| Subject: drm/radeon: fix multiple reference count leak |
| |
| From: Aditya Pakki <pakki001@umn.edu> |
| |
| [ Upstream commit 6f2e8acdb48ed166b65d47837c31b177460491ec ] |
| |
| 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. |
| |
| 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_connectors.c | 20 +++++++++++++++----- |
| 1 file changed, 15 insertions(+), 5 deletions(-) |
| |
| diff --git a/drivers/gpu/drm/radeon/radeon_connectors.c b/drivers/gpu/drm/radeon/radeon_connectors.c |
| index efa875120071a..9e6c2be0cc7d4 100644 |
| --- a/drivers/gpu/drm/radeon/radeon_connectors.c |
| +++ b/drivers/gpu/drm/radeon/radeon_connectors.c |
| @@ -892,8 +892,10 @@ 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) |
| + if (r < 0) { |
| + pm_runtime_put_autosuspend(connector->dev->dev); |
| return connector_status_disconnected; |
| + } |
| } |
| |
| if (encoder) { |
| @@ -1038,8 +1040,10 @@ 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) |
| + if (r < 0) { |
| + pm_runtime_put_autosuspend(connector->dev->dev); |
| return connector_status_disconnected; |
| + } |
| } |
| |
| encoder = radeon_best_single_encoder(connector); |
| @@ -1176,8 +1180,10 @@ 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) |
| + if (r < 0) { |
| + pm_runtime_put_autosuspend(connector->dev->dev); |
| return connector_status_disconnected; |
| + } |
| } |
| |
| encoder = radeon_best_single_encoder(connector); |
| @@ -1260,8 +1266,10 @@ 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) |
| + if (r < 0) { |
| + pm_runtime_put_autosuspend(connector->dev->dev); |
| return connector_status_disconnected; |
| + } |
| } |
| |
| if (radeon_connector->detected_hpd_without_ddc) { |
| @@ -1701,8 +1709,10 @@ 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) |
| + if (r < 0) { |
| + pm_runtime_put_autosuspend(connector->dev->dev); |
| return connector_status_disconnected; |
| + } |
| } |
| |
| if (!force && radeon_check_hpd_status_unchanged(connector)) { |
| -- |
| 2.25.1 |
| |