Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1c4672ce authored by Paulo Zanoni's avatar Paulo Zanoni Committed by Jani Nikula
Browse files

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: 9b58e352 ("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: default avatarPaulo Zanoni <paulo.r.zanoni@intel.com>
Acked-by: default avatarRodrigo Vivi <rodrigo.vivi@intel.com>
Reviewed-by: default avatarRodrigo Vivi <rodrigo.vivi@intel.com>
Acked-by: default avatarJani 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 2ee7dc49)
Signed-off-by: default avatarJani Nikula <jani.nikula@intel.com>
parent b1b7ec98

drivers/gpu/drm/i915/intel_psr.c

+3 −7
Original line number Diff line number Diff line
@@ -825,13 +825,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_priv) || IS_BROADWELL(dev_priv))

			i915.enable_psr = 1;

		else

	/* 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_priv) || IS_BROADWELL(dev_priv))