On Fri, Nov 09, 2018 at 12:20:14PM -0800, José Roberto de Souza wrote: > If a PSR error happened and the driver is reloaded, the EDP_PSR_IIR > will still keep the error set even after the reset done in the > irq_preinstall and irq_uninstall hooks. > And enabling in this situation cause the screen to freeze in the > first time that PSR HW tries to activate so lets keep PSR disabled > to avoid any rendering problems. > > v4: Moved handling from intel_psr_compute_config() to > intel_psr_init() to avoid hardware access during compute(Ville) > > Cc: Ville Syrjälä <[email protected]> > Cc: Dhinakaran Pandiyan <[email protected]> > Signed-off-by: José Roberto de Souza <[email protected]>
Reviewed-by: Rodrigo Vivi <[email protected]> > --- > drivers/gpu/drm/i915/intel_psr.c | 14 ++++++++++++++ > 1 file changed, 14 insertions(+) > > diff --git a/drivers/gpu/drm/i915/intel_psr.c > b/drivers/gpu/drm/i915/intel_psr.c > index 93d8538a2383..e505b0b9ae47 100644 > --- a/drivers/gpu/drm/i915/intel_psr.c > +++ b/drivers/gpu/drm/i915/intel_psr.c > @@ -1084,6 +1084,20 @@ void intel_psr_init(struct drm_i915_private *dev_priv) > if (INTEL_GEN(dev_priv) < 9 || !dev_priv->vbt.psr.enable) > i915_modparams.enable_psr = 0; > > + /* > + * If a PSR error happened and the driver is reloaded, the EDP_PSR_IIR > + * will still keep the error set even after the reset done in the > + * irq_preinstall and irq_uninstall hooks. > + * And enabling in this situation cause the screen to freeze in the > + * first time that PSR HW tries to activate so lets keep PSR disabled > + * to avoid any rendering problems. > + */ > + if (I915_READ(EDP_PSR_IIR) & EDP_PSR_ERROR(TRANSCODER_EDP)) { > + DRM_DEBUG_KMS("PSR interruption error set\n"); > + dev_priv->psr.sink_not_reliable = true; > + return; > + } > + > /* Set link_standby x link_off defaults */ > if (IS_HASWELL(dev_priv) || IS_BROADWELL(dev_priv)) > /* HSW and BDW require workarounds that we don't implement. */ > -- > 2.19.1 > > _______________________________________________ > Intel-gfx mailing list > [email protected] > https://lists.freedesktop.org/mailman/listinfo/intel-gfx _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
