| From baf5a28880b8c9840fd32d9fd9a2ed5401a95e8e Mon Sep 17 00:00:00 2001 |
| From: Paulo Zanoni <paulo.r.zanoni@intel.com> |
| Date: Tue, 13 Dec 2016 18:57:44 -0200 |
| Subject: [PATCH] drm/i915: disable PSR by default on HSW/BDW |
| |
| commit 1c4672ce4eeaeaadeea8adabaad21262b7172607 upstream. |
| |
| We've been ignoring the poor bugzilla reporters that say PSR causes |
| system lockups and all other sorts of problems. The earliest bug |
| report is from April, so I think we can use the "revert the offending |
| commit if no fixes are presented within 8 months" rule here. |
| |
| Fixes: 9b58e352b463 ("drm/i915: Enable PSR by default on Haswell and Broadwell.") |
| Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=97602 |
| Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=97515 |
| Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=96736 |
| Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=96704 |
| Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=96569 |
| Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=95176 |
| Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=94985 |
| Cc: <stable@vger.kernel.org> # v4.6+ |
| Cc: Rodrigo Vivi <rodrigo.vivi@intel.com> |
| Cc: Jim Bride <jim.bride@linux.intel.com> |
| Signed-off-by: Paulo Zanoni <paulo.r.zanoni@intel.com> |
| Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com> |
| Reviewed-by: Rodrigo Vivi <rodrigo.vivi@intel.com> |
| Acked-by: Jani Nikula <jani.nikula@intel.com> |
| Link: http://patchwork.freedesktop.org/patch/msgid/1481662664-18986-1-git-send-email-paulo.r.zanoni@intel.com |
| (cherry picked from commit 2ee7dc497e348eecbb82adbb1ea9e9a7e29fe921) |
| Signed-off-by: Jani Nikula <jani.nikula@intel.com> |
| Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> |
| |
| diff --git a/drivers/gpu/drm/i915/intel_psr.c b/drivers/gpu/drm/i915/intel_psr.c |
| index cf171b4b8c67..7216b9fa86b7 100644 |
| --- a/drivers/gpu/drm/i915/intel_psr.c |
| +++ b/drivers/gpu/drm/i915/intel_psr.c |
| @@ -829,13 +829,9 @@ void intel_psr_init(struct drm_device *dev) |
| dev_priv->psr_mmio_base = IS_HASWELL(dev_priv) ? |
| HSW_EDP_PSR_BASE : BDW_EDP_PSR_BASE; |
| |
| - /* Per platform default */ |
| - if (i915.enable_psr == -1) { |
| - if (IS_HASWELL(dev) || IS_BROADWELL(dev)) |
| - i915.enable_psr = 1; |
| - else |
| - i915.enable_psr = 0; |
| - } |
| + /* Per platform default: all disabled. */ |
| + if (i915.enable_psr == -1) |
| + i915.enable_psr = 0; |
| |
| /* Set link_standby x link_off defaults */ |
| if (IS_HASWELL(dev) || IS_BROADWELL(dev)) |
| -- |
| 2.10.1 |
| |
