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 <ch...@chris-wilson.co.uk>
Cc: Rodrigo Vivi <rodrigo.v...@intel.com>
Cc: Dhinakaran Pandiyan <dhinakaran.pandi...@intel.com>
Cc: José Roberto de Souza <jose.so...@intel.com>
Cc: Jani Nikula <jani.nik...@linux.intel.com>
Cc: Joonas Lahtinen <joonas.lahti...@linux.intel.com>
Cc: sta...@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

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

Reply via email to