Merge tag 'drm-intel-next-2014-09-01' of git://anongit.freedesktop.org/drm-intel...

[mirror_ubuntu-artful-kernel.git] / drivers / gpu / drm / i915 / i915_params.c

diff --git a/drivers/gpu/drm/i915/i915_params.c b/drivers/gpu/drm/i915/i915_params.c
index 1dcb1bed5ef8cce143a492be9774d6d90eced581..139f490d464df8ae5ac1c400c877d3cb67b23988 100644 (file)
--- a/drivers/gpu/drm/i915/i915_params.c
+++ b/drivers/gpu/drm/i915/i915_params.c
@@ -38,7 +38,7 @@ struct i915_params i915 __read_mostly = {
        .enable_execlists = 0,
        .enable_hangcheck = true,
        .enable_ppgtt = -1,
-       .enable_psr = 1,
+       .enable_psr = 0,
        .preliminary_hw_support = IS_ENABLED(CONFIG_DRM_I915_PRELIMINARY_HW_SUPPORT),
        .disable_power_well = 1,
        .enable_ips = 1,
@@ -125,7 +125,7 @@ MODULE_PARM_DESC(enable_execlists,
        "(-1=auto, 0=disabled [default], 1=enabled)");
 
 module_param_named(enable_psr, i915.enable_psr, int, 0600);
-MODULE_PARM_DESC(enable_psr, "Enable PSR (default: true)");
+MODULE_PARM_DESC(enable_psr, "Enable PSR (default: false)");
 
 module_param_named(preliminary_hw_support, i915.preliminary_hw_support, int, 0600);
 MODULE_PARM_DESC(preliminary_hw_support,