[PATCH] drm/amd/powerplay: add missing smu_get_clk_info_from_vbios() call

Evan Quan evan.quan at amd.com
Tue Jun 25 15:07:42 UTC 2019


This seems a merge error.

Change-Id: I67389739512c8297da1187428682cc59f560ab03
Signed-off-by: Evan Quan <evan.quan at amd.com>
---
 drivers/gpu/drm/amd/powerplay/amdgpu_smu.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/drivers/gpu/drm/amd/powerplay/amdgpu_smu.c b/drivers/gpu/drm/amd/powerplay/amdgpu_smu.c
index fe83c5e3111f..47b21ad4365c 100644
--- a/drivers/gpu/drm/amd/powerplay/amdgpu_smu.c
+++ b/drivers/gpu/drm/amd/powerplay/amdgpu_smu.c
@@ -823,6 +823,10 @@ static int smu_smc_table_hw_init(struct smu_context *smu,
 		 * check if the format_revision in vbios is up to pptable header
 		 * version, and the structure size is not 0.
 		 */
+		ret = smu_get_clk_info_from_vbios(smu);
+		if (ret)
+			return ret;
+
 		ret = smu_check_pptable(smu);
 		if (ret)
 			return ret;
-- 
2.21.0



More information about the amd-gfx mailing list