summaryrefslogtreecommitdiff
path: root/drivers/gpu/drm/amd/pm/inc/smu_v11_0.h
diff options
context:
space:
mode:
authorIngo Molnar <mingo@kernel.org>2021-02-12 15:36:43 +0300
committerIngo Molnar <mingo@kernel.org>2021-02-12 15:36:43 +0300
commita3251c1a36f595046bea03935ebe37a1e1f1f1d7 (patch)
tree14b51f8bf1d7e1bb35697cb4704255b51b15baa9 /drivers/gpu/drm/amd/pm/inc/smu_v11_0.h
parent72f40a2823d6e16229ab58b898c6f22044e5222f (diff)
parentab234a260b1f625b26cbefa93ca365b0ae66df33 (diff)
downloadlinux-a3251c1a36f595046bea03935ebe37a1e1f1f1d7.tar.xz
Merge branch 'x86/paravirt' into x86/entry
Merge in the recent paravirt changes to resolve conflicts caused by objtool annotations. Conflicts: arch/x86/xen/xen-asm.S Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'drivers/gpu/drm/amd/pm/inc/smu_v11_0.h')
-rw-r--r--drivers/gpu/drm/amd/pm/inc/smu_v11_0.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/gpu/drm/amd/pm/inc/smu_v11_0.h b/drivers/gpu/drm/amd/pm/inc/smu_v11_0.h
index 13de692a4213..5d0b29653ffa 100644
--- a/drivers/gpu/drm/amd/pm/inc/smu_v11_0.h
+++ b/drivers/gpu/drm/amd/pm/inc/smu_v11_0.h
@@ -203,6 +203,9 @@ int
smu_v11_0_set_fan_control_mode(struct smu_context *smu,
uint32_t mode);
+int
+smu_v11_0_set_fan_speed_percent(struct smu_context *smu, uint32_t speed);
+
int smu_v11_0_set_fan_speed_rpm(struct smu_context *smu,
uint32_t speed);