projects
/
openwrt
/
staging
/
blogic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
505ac30
)
drm/amd/powerplay: add missing smu_get_clk_info_from_vbios() call
author
Evan Quan
<evan.quan@amd.com>
Tue, 25 Jun 2019 15:03:00 +0000
(23:03 +0800)
committer
Alex Deucher
<alexander.deucher@amd.com>
Thu, 27 Jun 2019 16:22:28 +0000
(11:22 -0500)
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>
drivers/gpu/drm/amd/powerplay/amdgpu_smu.c
patch
|
blob
|
history
diff --git
a/drivers/gpu/drm/amd/powerplay/amdgpu_smu.c
b/drivers/gpu/drm/amd/powerplay/amdgpu_smu.c
index a0fb36360bea3a915716f15d95055136a3e31337..31152d495f695fbc7884203a601813da079245f7 100644
(file)
--- 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,
if (ret)
return ret;
+ ret = smu_get_clk_info_from_vbios(smu);
+ if (ret)
+ return ret;
+
/*
* check if the format_revision in vbios is up to pptable header
* version, and the structure size is not 0.