diff options
| author | Sasha Levin <sashal@kernel.org> | 2026-10-30 06:41:01 -0400 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2026-10-30 13:49:01 +0000 |
| commit | 37a382d8b8a0587fb8e8bf651533b1ce84f06037 (patch) | |
| tree | 7e6d54f0e91ecf367fb1cc1015e809e62a98d28c /include/uapi/linux/can | |
| parent | e8f09b74f627c0805204af23d6fc59cef3732da0 (diff) | |
| download | linux-next-37a382d8b8a0587fb8e8bf651533b1ce84f06037.tar.gz linux-next-37a382d8b8a0587fb8e8bf651533b1ce84f06037.zip | |
drm/amd/pm: fix up the amdgpu merge of the smu 14.0.2 zero fan restore
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/auNVlhF6DGyFYx10@sirena.org.uk/
Signed-off-by: Sasha Levin <sashal@kernel.org>
Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'include/uapi/linux/can')
0 files changed, 0 insertions, 0 deletions