Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

drm/i915: disable PSR by default on HSW/BDW

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>

authored by

Paulo Zanoni and committed by
Jani Nikula
1c4672ce b1b7ec98

+3 -7
+3 -7
drivers/gpu/drm/i915/intel_psr.c
··· 825 825 dev_priv->psr_mmio_base = IS_HASWELL(dev_priv) ? 826 826 HSW_EDP_PSR_BASE : BDW_EDP_PSR_BASE; 827 827 828 - /* Per platform default */ 829 - if (i915.enable_psr == -1) { 830 - if (IS_HASWELL(dev_priv) || IS_BROADWELL(dev_priv)) 831 - i915.enable_psr = 1; 832 - else 833 - i915.enable_psr = 0; 834 - } 828 + /* Per platform default: all disabled. */ 829 + if (i915.enable_psr == -1) 830 + i915.enable_psr = 0; 835 831 836 832 /* Set link_standby x link_off defaults */ 837 833 if (IS_HASWELL(dev_priv) || IS_BROADWELL(dev_priv))