1 |
From 6fea87637bf36bd285227f490132e83582ab7513 Mon Sep 17 00:00:00 2001 |
2 |
From: Evan Quan <evan.quan@amd.com> |
3 |
Date: Fri, 16 Dec 2022 17:12:53 +0800 |
4 |
Subject: drm/amd/pm: correct the reference clock for fan speed(rpm) calculation |
5 |
|
6 |
From: Evan Quan <evan.quan@amd.com> |
7 |
|
8 |
commit 6fea87637bf36bd285227f490132e83582ab7513 upstream. |
9 |
|
10 |
Correct the reference clock as 25Mhz for SMU13 fan speed calculation. |
11 |
|
12 |
Signed-off-by: Evan Quan <evan.quan@amd.com> |
13 |
Reviewed-by: Alex Deucher <alexander.deucher@amd.com> |
14 |
Signed-off-by: Alex Deucher <alexander.deucher@amd.com> |
15 |
Cc: stable@vger.kernel.org # 6.0.x, 6.1.x |
16 |
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
17 |
--- |
18 |
drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0.c | 4 ++-- |
19 |
1 file changed, 2 insertions(+), 2 deletions(-) |
20 |
|
21 |
--- a/drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0.c |
22 |
+++ b/drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0.c |
23 |
@@ -1258,7 +1258,8 @@ int smu_v13_0_set_fan_speed_rpm(struct s |
24 |
uint32_t speed) |
25 |
{ |
26 |
struct amdgpu_device *adev = smu->adev; |
27 |
- uint32_t tach_period, crystal_clock_freq; |
28 |
+ uint32_t crystal_clock_freq = 2500; |
29 |
+ uint32_t tach_period; |
30 |
int ret; |
31 |
|
32 |
if (!speed) |
33 |
@@ -1268,7 +1269,6 @@ int smu_v13_0_set_fan_speed_rpm(struct s |
34 |
if (ret) |
35 |
return ret; |
36 |
|
37 |
- crystal_clock_freq = amdgpu_asic_get_xclk(adev); |
38 |
tach_period = 60 * crystal_clock_freq * 10000 / (8 * speed); |
39 |
WREG32_SOC15(THM, 0, regCG_TACH_CTRL, |
40 |
REG_SET_FIELD(RREG32_SOC15(THM, 0, regCG_TACH_CTRL), |