| From 5f417547c014c048937db7b7dfb52805e041bdfc Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Sun, 14 Jun 2020 02:09:44 -0500 |
| Subject: drm/amdgpu: fix ref count leak in amdgpu_display_crtc_set_config |
| |
| From: Navid Emamdoost <navid.emamdoost@gmail.com> |
| |
| [ Upstream commit e008fa6fb41544b63973a529b704ef342f47cc65 ] |
| |
| in amdgpu_display_crtc_set_config, the call to pm_runtime_get_sync |
| increments the counter even in case of failure, leading to incorrect |
| ref count. In case of failure, decrement the ref count before returning. |
| |
| Signed-off-by: Navid Emamdoost <navid.emamdoost@gmail.com> |
| Signed-off-by: Alex Deucher <alexander.deucher@amd.com> |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| drivers/gpu/drm/amd/amdgpu/amdgpu_display.c | 5 +++-- |
| 1 file changed, 3 insertions(+), 2 deletions(-) |
| |
| diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_display.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_display.c |
| index 15a2d8f3725d5..fdf7a18058881 100644 |
| --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_display.c |
| +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_display.c |
| @@ -268,7 +268,7 @@ int amdgpu_crtc_set_config(struct drm_mode_set *set) |
| |
| ret = pm_runtime_get_sync(dev->dev); |
| if (ret < 0) |
| - return ret; |
| + goto out; |
| |
| ret = drm_crtc_helper_set_config(set); |
| |
| @@ -283,7 +283,7 @@ int amdgpu_crtc_set_config(struct drm_mode_set *set) |
| take the current one */ |
| if (active && !adev->have_disp_power_ref) { |
| adev->have_disp_power_ref = true; |
| - return ret; |
| + goto out; |
| } |
| /* if we have no active crtcs, then drop the power ref |
| we got before */ |
| @@ -292,6 +292,7 @@ int amdgpu_crtc_set_config(struct drm_mode_set *set) |
| adev->have_disp_power_ref = false; |
| } |
| |
| +out: |
| /* drop the power reference we got coming in here */ |
| pm_runtime_put_autosuspend(dev->dev); |
| return ret; |
| -- |
| 2.25.1 |
| |
