diff mbox series

[3/3] Revert "UBUNTU: SAUCE: drm/i915: Disable PSR by default on all platforms"

Message ID 20201208171354.2514330-4-kai.heng.feng@canonical.com
State New
Headers show
Series Drop i915 PSR workarounds | expand

Commit Message

Kai-Heng Feng Dec. 8, 2020, 5:13 p.m. UTC 
BugLink: https://bugs.launchpad.net/bugs/1907285

This reverts commit 5382aafaa7296a1b5ee7c4b93a0eb3b04726db0c.

Signed-off-by: Kai-Heng Feng <kai.heng.feng@canonical.com>
---
 drivers/gpu/drm/i915/i915_params.c | 3 ++-
 drivers/gpu/drm/i915/i915_params.h | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)
diff mbox series

Patch

diff --git a/drivers/gpu/drm/i915/i915_params.c b/drivers/gpu/drm/i915/i915_params.c
index 5e9dfbed8b6a..7f139ea4a90b 100644
--- a/drivers/gpu/drm/i915/i915_params.c
+++ b/drivers/gpu/drm/i915/i915_params.c
@@ -94,7 +94,8 @@  i915_param_named_unsafe(enable_hangcheck, bool, 0400,
 
 i915_param_named_unsafe(enable_psr, int, 0400,
 	"Enable PSR "
-	"(-1=use per-chip default, 0=disabled [default], 1=enabled) ");
+	"(0=disabled, 1=enabled) "
+	"Default: -1 (use per-chip default)");
 
 i915_param_named(psr_safest_params, bool, 0400,
 	"Replace PSR VBT parameters by the safest and not optimal ones. This "
diff --git a/drivers/gpu/drm/i915/i915_params.h b/drivers/gpu/drm/i915/i915_params.h
index ff724a1843e7..330c03e2b4f7 100644
--- a/drivers/gpu/drm/i915/i915_params.h
+++ b/drivers/gpu/drm/i915/i915_params.h
@@ -52,7 +52,7 @@  struct drm_printer;
 	param(int, vbt_sdvo_panel_type, -1, 0400) \
 	param(int, enable_dc, -1, 0400) \
 	param(int, enable_fbc, -1, 0600) \
-	param(int, enable_psr, 0, 0600) \
+	param(int, enable_psr, -1, 0600) \
 	param(bool, psr_safest_params, false, 0600) \
 	param(bool, enable_psr2_sel_fetch, false, 0600) \
 	param(int, disable_power_well, -1, 0400) \