FAILED: patch "[PATCH] drm/amdgpu/pm/smu11: Fix fan set speed bug" failed to apply to 5.9-stable tree

PATCH [email protected] 1 participant 1 message Dec 9, 2020

Subsystems (4)

Stable branch DRM drivers Radeon and amdgpu DRM drivers AMD powerplay and SWSMU

lore

Share & tools

lore

[email protected]

author maintainer

2020-12-09 15:53 UTC #0 lore raw

The patch below does not apply to the 5.9-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.

thanks,

greg k-h

------------------ original commit in Linus's tree ------------------

From acab02c1af43d3a9051524579b1c3dcfbfa5479d Mon Sep 17 00:00:00 2001
From: Arunpravin <[email protected]>
Date: Fri, 27 Nov 2020 21:40:24 +0530
Subject: [PATCH] drm/amdgpu/pm/smu11: Fix fan set speed bug

Fix fan set speed calculation.

Signed-off-by Arunpravin <[email protected]>

Acked-by Alex Deucher <[email protected]>

Reviewed-by Kenneth Feng <[email protected]>

Signed-off-by Alex Deucher <[email protected]>

Cc [email protected]

drivers/gpu/drm/amd/pm/swsmu/smu11/smu_v11_0.c +6 -1

index 2380759ddf48..6db96fa1df09 100644
@@ -1164,7 +1164,12 @@ int smu_v11_0_set_fan_speed_rpm(struct smu_context *smu,
 	if (ret)
 		return ret;
 
-	crystal_clock_freq = amdgpu_asic_get_xclk(adev);
+	/*
+	 * crystal_clock_freq div by 4 is required since the fan control
+	 * module refers to 25MHz
+	 */
+
+	crystal_clock_freq = amdgpu_asic_get_xclk(adev) / 4;
 	tach_period = 60 * crystal_clock_freq * 10000 / (8 * speed);
 	WREG32_SOC15(THM, 0, mmCG_TACH_CTRL,
 		     REG_SET_FIELD(RREG32_SOC15(THM, 0, mmCG_TACH_CTRL),