diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-08-08 17:48:26 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-08-08 17:48:26 -0400 |
commit | 27d438c56009e5ae632de36fe70985d1aab5e344 (patch) | |
tree | fa969e68a69e94b6858fd84ab597145f99fbfec1 /drivers/gpu/drm/i915/i915_params.c | |
parent | 0a44e68ca0a8456ed33c62c99b8c42bebdcbbc8c (diff) |
Revert "drm/i915: Enable PSR by default."
This reverts commit b6d547791fd3ef4ccc89ad2556ab01045640aef7.
The panel self refresh clearly isn't stable yet, and causes my laptop
(Haswell ULT in a Sony Vaio Pro) to have the screen lock up. Maybe it
doesn't ever get out of self-refresh, or maybe there are gremlins in the
machine that get unhappy. Regardless, it's broken, and it gets
reverted.
Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/gpu/drm/i915/i915_params.c')
-rw-r--r-- | drivers/gpu/drm/i915/i915_params.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/i915/i915_params.c b/drivers/gpu/drm/i915/i915_params.c index 62ee8308d682..7f84dd263ee8 100644 --- a/drivers/gpu/drm/i915/i915_params.c +++ b/drivers/gpu/drm/i915/i915_params.c | |||
@@ -37,7 +37,7 @@ struct i915_params i915 __read_mostly = { | |||
37 | .enable_fbc = -1, | 37 | .enable_fbc = -1, |
38 | .enable_hangcheck = true, | 38 | .enable_hangcheck = true, |
39 | .enable_ppgtt = -1, | 39 | .enable_ppgtt = -1, |
40 | .enable_psr = 1, | 40 | .enable_psr = 0, |
41 | .preliminary_hw_support = IS_ENABLED(CONFIG_DRM_I915_PRELIMINARY_HW_SUPPORT), | 41 | .preliminary_hw_support = IS_ENABLED(CONFIG_DRM_I915_PRELIMINARY_HW_SUPPORT), |
42 | .disable_power_well = 1, | 42 | .disable_power_well = 1, |
43 | .enable_ips = 1, | 43 | .enable_ips = 1, |
@@ -119,7 +119,7 @@ MODULE_PARM_DESC(enable_ppgtt, | |||
119 | "(-1=auto [default], 0=disabled, 1=aliasing, 2=full)"); | 119 | "(-1=auto [default], 0=disabled, 1=aliasing, 2=full)"); |
120 | 120 | ||
121 | module_param_named(enable_psr, i915.enable_psr, int, 0600); | 121 | module_param_named(enable_psr, i915.enable_psr, int, 0600); |
122 | MODULE_PARM_DESC(enable_psr, "Enable PSR (default: true)"); | 122 | MODULE_PARM_DESC(enable_psr, "Enable PSR (default: false)"); |
123 | 123 | ||
124 | module_param_named(preliminary_hw_support, i915.preliminary_hw_support, int, 0600); | 124 | module_param_named(preliminary_hw_support, i915.preliminary_hw_support, int, 0600); |
125 | MODULE_PARM_DESC(preliminary_hw_support, | 125 | MODULE_PARM_DESC(preliminary_hw_support, |