* [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
0 siblings, 1 reply; 3+ 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] 3+ messages in thread* Re: [Intel-gfx] [PATCH] drm/i915: Revert "drm/i915: Enable PSR2 by default"
2019-07-11 9:22 [PATCH] drm/i915: Revert "drm/i915: Enable PSR2 by default" Chris Wilson
@ 2019-07-11 11:02 ` Rodrigo Vivi
2019-07-11 11:08 ` Chris Wilson
0 siblings, 1 reply; 3+ messages in thread
From: Rodrigo Vivi @ 2019-07-11 11:02 UTC (permalink / raw)
To: Chris Wilson; +Cc: intel-gfx, Dhinakaran Pandiyan, stable
On Thu, Jul 11, 2019 at 10:22:54AM +0100, Chris Wilson wrote:
> 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
I agree it is critical, but unfortunately this revert won't solve the issue.
[ 1.954886] [drm:intel_psr_init_dpcd [i915]] eDP panel supports PSR version 1
[ 2.003686] [drm:intel_psr_enable_locked [i915]] Enabling PSR1
Users are claiming the regression is only on 5.2 with 5.1 working well
and PSR1 is enabled by default since 5.0.
A bisect would be good, but it seems a hard issue to reproduce as well
what makes things more difficult.
> 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
>
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [Intel-gfx] [PATCH] drm/i915: Revert "drm/i915: Enable PSR2 by default"
2019-07-11 11:02 ` [Intel-gfx] " Rodrigo Vivi
@ 2019-07-11 11:08 ` Chris Wilson
0 siblings, 0 replies; 3+ messages in thread
From: Chris Wilson @ 2019-07-11 11:08 UTC (permalink / raw)
To: Rodrigo Vivi; +Cc: intel-gfx, Dhinakaran Pandiyan, stable
Quoting Rodrigo Vivi (2019-07-11 12:02:01)
> On Thu, Jul 11, 2019 at 10:22:54AM +0100, Chris Wilson wrote:
> > 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
>
> I agree it is critical, but unfortunately this revert won't solve the issue.
>
> [ 1.954886] [drm:intel_psr_init_dpcd [i915]] eDP panel supports PSR version 1
> [ 2.003686] [drm:intel_psr_enable_locked [i915]] Enabling PSR1
>
> Users are claiming the regression is only on 5.2 with 5.1 working well
> and PSR1 is enabled by default since 5.0.
Hmm, which panels are psr2 and is it being accurately reported?
If you suspect psr1, just revert both for now.
-Chris
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2019-07-11 11:08 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-07-11 9:22 [PATCH] drm/i915: Revert "drm/i915: Enable PSR2 by default" Chris Wilson
2019-07-11 11:02 ` [Intel-gfx] " Rodrigo Vivi
2019-07-11 11:08 ` Chris Wilson
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox