| From e9b2e9a83b4adf75064a6ba31e7f516e8fcb71ff Mon Sep 17 00:00:00 2001 |
| From: Alex Deucher <alexander.deucher@amd.com> |
| Date: Wed, 29 Jan 2020 12:42:57 -0500 |
| Subject: [PATCH] drm/amdgpu/smu10: fix smu10_get_clock_by_type_with_voltage |
| |
| commit 1064ad4aeef94f51ca230ac639a9e996fb7867a0 upstream. |
| |
| Cull out 0 clocks to avoid a warning in DC. |
| |
| Bug: https://gitlab.freedesktop.org/drm/amd/issues/963 |
| Reviewed-by: Evan Quan <evan.quan@amd.com> |
| Signed-off-by: Alex Deucher <alexander.deucher@amd.com> |
| Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> |
| |
| diff --git a/drivers/gpu/drm/amd/powerplay/hwmgr/smu10_hwmgr.c b/drivers/gpu/drm/amd/powerplay/hwmgr/smu10_hwmgr.c |
| index 6d00bec5ce06..61e5a5006bbb 100644 |
| --- a/drivers/gpu/drm/amd/powerplay/hwmgr/smu10_hwmgr.c |
| +++ b/drivers/gpu/drm/amd/powerplay/hwmgr/smu10_hwmgr.c |
| @@ -1080,9 +1080,11 @@ static int smu10_get_clock_by_type_with_voltage(struct pp_hwmgr *hwmgr, |
| |
| clocks->num_levels = 0; |
| for (i = 0; i < pclk_vol_table->count; i++) { |
| - clocks->data[i].clocks_in_khz = pclk_vol_table->entries[i].clk * 10; |
| - clocks->data[i].voltage_in_mv = pclk_vol_table->entries[i].vol; |
| - clocks->num_levels++; |
| + if (pclk_vol_table->entries[i].clk) { |
| + clocks->data[clocks->num_levels].clocks_in_khz = pclk_vol_table->entries[i].clk * 10; |
| + clocks->data[clocks->num_levels].voltage_in_mv = pclk_vol_table->entries[i].vol; |
| + clocks->num_levels++; |
| + } |
| } |
| |
| return 0; |
| -- |
| 2.7.4 |
| |
