Merge branches 'pm-opp', 'pm-cpufreq' and 'pm-tools'

[sagit-ice-cold/kernel_xiaomi_msm8998.git] / Documentation / kernel-parameters.txt

diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt
index eacb2e0..10b8cc1 100644 (file)
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
@@ -1446,6 +1446,15 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
                       disable
                         Do not enable intel_pstate as the default
                         scaling driver for the supported processors
+                      force
+                        Enable intel_pstate on systems that prohibit it by default
+                        in favor of acpi-cpufreq. Forcing the intel_pstate driver
+                        instead of acpi-cpufreq may disable platform features, such
+                        as thermal controls and power capping, that rely on ACPI
+                        P-States information being indicated to OSPM and therefore
+                        should be used with caution. This option does not work with
+                        processors that aren't supported by the intel_pstate driver
+                        or on platforms that use pcc-cpufreq instead of acpi-cpufreq.
                       no_hwp
                         Do not enable hardware P state control (HWP)
                         if available.