[PATCH] drm/i915: Revert "drm/i915: Enable PSR2 by default"

* [PATCH] drm/i915: Revert "drm/i915: Enable PSR2 by default"
@ 2019-07-11  9:22 Chris Wilson
  2019-07-11 11:02 ` [Intel-gfx] " Rodrigo Vivi
                   ` (2 more replies)
  0 siblings, 3 replies; 8+ messages in thread
From: Chris Wilson @ 2019-07-11  9:22 UTC (permalink / raw)
  To: intel-gfx
  Cc: Chris Wilson, Rodrigo Vivi, Dhinakaran Pandiyan,
	José Roberto de Souza, Jani Nikula, Joonas Lahtinen, stable

Multiple users are reporting black screens upon boot, after resume, or
frozen after a short period of idleness. A black screen on boot is a
critical issue so disable psr2 again until resolved.

This reverts commit 8f6e87d6d561f10cfa48a687345512419839b6d8.

Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=111088
Fixes: 8f6e87d6d561 ("drm/i915: Enable PSR2 by default")
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
Cc: Dhinakaran Pandiyan <dhinakaran.pandiyan@intel.com>
Cc: José Roberto de Souza <jose.souza@intel.com>
Cc: Jani Nikula <jani.nikula@linux.intel.com>
Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Cc: stable@vger.kernel.org #v5.2
---
 drivers/gpu/drm/i915/display/intel_psr.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/drivers/gpu/drm/i915/display/intel_psr.c b/drivers/gpu/drm/i915/display/intel_psr.c
index 69d908e6a050..ddde4da2de33 100644
--- a/drivers/gpu/drm/i915/display/intel_psr.c
+++ b/drivers/gpu/drm/i915/display/intel_psr.c
@@ -83,6 +83,9 @@ static bool intel_psr2_enabled(struct drm_i915_private *dev_priv,
 	case I915_PSR_DEBUG_DISABLE:
 	case I915_PSR_DEBUG_FORCE_PSR1:
 		return false;
+	case I915_PSR_DEBUG_DEFAULT:
+		if (i915_modparams.enable_psr <= 0)
+			return false;
 	default:
 		return crtc_state->has_psr2;
 	}
-- 
2.22.0

^ permalink raw reply related	[flat|nested] 8+ messages in thread