diff options
author | Evan Quan <evan.quan@amd.com> | 2019-06-25 11:03:00 -0400 |
---|---|---|
committer | Alex Deucher <alexander.deucher@amd.com> | 2019-06-27 12:22:28 -0400 |
commit | 309bce0ca8bd5804db27bc2d56fb1e272c1a5359 (patch) | |
tree | 84b671af5e5244951431e8bd39dc66c80870f9be | |
parent | 505ac3039a184b53ddb16f25cd10cab67af633f5 (diff) |
drm/amd/powerplay: add missing smu_get_clk_info_from_vbios() call
This seems a merge error.
Signed-off-by: Evan Quan <evan.quan@amd.com>
Reviewed-by: Hawking Zhang <Hawking.Zhang@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
-rw-r--r-- | drivers/gpu/drm/amd/powerplay/amdgpu_smu.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/gpu/drm/amd/powerplay/amdgpu_smu.c b/drivers/gpu/drm/amd/powerplay/amdgpu_smu.c index a0fb36360bea..31152d495f69 100644 --- a/drivers/gpu/drm/amd/powerplay/amdgpu_smu.c +++ b/drivers/gpu/drm/amd/powerplay/amdgpu_smu.c | |||
@@ -820,6 +820,10 @@ static int smu_smc_table_hw_init(struct smu_context *smu, | |||
820 | if (ret) | 820 | if (ret) |
821 | return ret; | 821 | return ret; |
822 | 822 | ||
823 | ret = smu_get_clk_info_from_vbios(smu); | ||
824 | if (ret) | ||
825 | return ret; | ||
826 | |||
823 | /* | 827 | /* |
824 | * check if the format_revision in vbios is up to pptable header | 828 | * check if the format_revision in vbios is up to pptable header |
825 | * version, and the structure size is not 0. | 829 | * version, and the structure size is not 0. |