| Message ID | 20190711092254.1719-1-chris@chris-wilson.co.uk (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | drm/i915: Revert "drm/i915: Enable PSR2 by default" | expand |
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
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
Quoting Patchwork (2019-07-11 16:16:45) > #### Possible fixes #### > > * igt@kms_psr@cursor_plane_move: > - fi-whl-u: [FAIL][7] ([fdo#107383]) -> [PASS][8] +3 similar issues > [7]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6458/fi-whl-u/igt@kms_psr@cursor_plane_move.html > [8]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13620/fi-whl-u/igt@kms_psr@cursor_plane_move.html To no great surprise as this regressed from the same patch to enable psr2 by default. -Chris
On Thu, 2019-07-11 at 16:21 +0100, Chris Wilson wrote: > Quoting Patchwork (2019-07-11 16:16:45) > > #### Possible fixes #### > > > > * igt@kms_psr@cursor_plane_move: > > - fi-whl-u: [FAIL][7] ([fdo#107383]) -> [PASS][8] +3 > > similar issues > > [7]: > > https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6458/fi-whl-u/igt@kms_psr@cursor_plane_move.html > > [8]: > > https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13620/fi-whl-u/igt@kms_psr@cursor_plane_move.html > > To no great surprise as this regressed from the same patch to enable > psr2 by default. This is a flipping result as cursor_plane_move will always test PSR1, we have the same test for PSR2: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6452/shard-iclb2/igt@kms_psr@psr2_cursor_plane_move.html > -Chris > _______________________________________________ > Intel-gfx mailing list > Intel-gfx@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/intel-gfx
On Thu, Jul 11, 2019 at 12:08:12PM +0100, Chris Wilson wrote: > 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? yes, this part of detection is pretty reliable. I'd expect PSR2 only on brand new panels > > If you suspect psr1, just revert both for now. I'm hesitating on the revert because psr worked find for 5.0 and 5.1 and even on the current issue the reproducibility is really low plus the fact that Jose is on top of that working right now. but yeap, if more issues start to pop up and time passing by we will have no choice again. > -Chris
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; }
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(+)