| From 513dfc89e6df0493af0e2efeee221c909d6444c0 Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Wed, 17 Jun 2020 16:33:47 -0400 |
| Subject: drm/amdgpu/display bail early in dm_pp_get_static_clocks |
| |
| From: Alex Deucher <alexander.deucher@amd.com> |
| |
| [ Upstream commit 376814f5fcf1aadda501d1413d56e8af85d19a97 ] |
| |
| If there are no supported callbacks. We'll fall back to the |
| nominal clocks. |
| |
| Bug: https://gitlab.freedesktop.org/drm/amd/-/issues/1170 |
| Reviewed-by: Evan Quan <evan.quan@amd.com> |
| Signed-off-by: Alex Deucher <alexander.deucher@amd.com> |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_pp_smu.c | 2 ++ |
| 1 file changed, 2 insertions(+) |
| |
| diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_pp_smu.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_pp_smu.c |
| index a2e1a73f66b81..7cee8070cb113 100644 |
| --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_pp_smu.c |
| +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_pp_smu.c |
| @@ -530,6 +530,8 @@ bool dm_pp_get_static_clocks( |
| &pp_clk_info); |
| else if (adev->smu.ppt_funcs) |
| ret = smu_get_current_clocks(&adev->smu, &pp_clk_info); |
| + else |
| + return false; |
| if (ret) |
| return false; |
| |
| -- |
| 2.25.1 |
| |
