After the drm merge, smu_v14_0_2_od_restore_table_single() has two
PP_OD_EDIT_FAN_ZERO_RPM_STOP_TEMP cases: the drm-next one and the one
from commit a2eae9f4fa1b ("drm/amd/pm: add zero fan stop temperature
support on smu 14.0.2") in mainline. The amdgpu merge resolution drops
the drm-next one and keeps the mainline one, which still sets
PP_OD_FEATURE_ZERO_FAN_BIT in FeatureCtrlMask.
Commit 8d4ce79aff1c ("drm/amd/pm: preserve committed OD features for
SMU 14.0.2") and its drm-next cherry-pick removed that update from both
zero fan restore cases. Remove it again so the file matches the amdgpu
tree.
Fixes: 0575e86c31a9 ("Merge branch 'drm-next' of
https://gitlab.freedesktop.org/agd5f/linux.git";)
Link: https://lore.kernel.org/all/[email protected]/
Signed-off-by: Sasha Levin <[email protected]>
---
Mark, this applies on top of next-20261029 and is meant to be folded into
the amdgpu merge resolution.
drivers/gpu/drm/amd/pm/swsmu/smu14/smu_v14_0_2_ppt.c | 1 -
1 file changed, 1 deletion(-)
diff --git a/drivers/gpu/drm/amd/pm/swsmu/smu14/smu_v14_0_2_ppt.c
b/drivers/gpu/drm/amd/pm/swsmu/smu14/smu_v14_0_2_ppt.c
index 24a3d61d8ea66..62f16d17e22bc 100644
--- a/drivers/gpu/drm/amd/pm/swsmu/smu14/smu_v14_0_2_ppt.c
+++ b/drivers/gpu/drm/amd/pm/swsmu/smu14/smu_v14_0_2_ppt.c
@@ -2606,7 +2606,6 @@ static int smu_v14_0_2_od_restore_table_single(struct
smu_context *smu, long inp
case PP_OD_EDIT_FAN_ZERO_RPM_STOP_TEMP:
od_table->OverDriveTable.FanZeroRpmStopTemp =
boot_overdrive_table->OverDriveTable.FanZeroRpmStopTemp;
- od_table->OverDriveTable.FeatureCtrlMask |=
BIT(PP_OD_FEATURE_ZERO_FAN_BIT);
break;
case PP_OD_EDIT_ACOUSTIC_LIMIT:
od_table->OverDriveTable.AcousticLimitRpmThreshold =
base-commit: a39c950806213f6861d00f90729acaaa21f2d95a
--
2.53.0
