On Thursday, September 20, 2018 1:43:20 PM PDT José Roberto de Souza wrote: > Now both PSR and PSR2 have the same exit mask, so let's share then > instead of have the same code 2 times. > > Cc: Dhinakaran Pandiyan <[email protected]> > Signed-off-by: José Roberto de Souza <[email protected]> > --- > drivers/gpu/drm/i915/intel_psr.c | 34 ++++++++++++-------------------- > 1 file changed, 13 insertions(+), 21 deletions(-) > > diff --git a/drivers/gpu/drm/i915/intel_psr.c > b/drivers/gpu/drm/i915/intel_psr.c index b6838b525502..358bbcd3b5f3 100644 > --- a/drivers/gpu/drm/i915/intel_psr.c > +++ b/drivers/gpu/drm/i915/intel_psr.c > @@ -575,28 +575,20 @@ static void intel_psr_enable_source(struct intel_dp > *intel_dp, else > chicken &= ~VSC_DATA_SEL_SOFTWARE_CONTROL; > I915_WRITE(CHICKEN_TRANS(cpu_transcoder), chicken); > - > - I915_WRITE(EDP_PSR_DEBUG, > - EDP_PSR_DEBUG_MASK_MEMUP | > - EDP_PSR_DEBUG_MASK_HPD | > - EDP_PSR_DEBUG_MASK_LPSP | > - EDP_PSR_DEBUG_MASK_MAX_SLEEP | > - EDP_PSR_DEBUG_MASK_DISP_REG_WRITE); > - } else { > - /* > - * Per Spec: Avoid continuous PSR exit by masking MEMUP > - * and HPD. also mask LPSP to avoid dependency on other > - * drivers that might block runtime_pm besides > - * preventing other hw tracking issues now we can rely > - * on frontbuffer tracking. > - */ > - I915_WRITE(EDP_PSR_DEBUG, > - EDP_PSR_DEBUG_MASK_MEMUP | > - EDP_PSR_DEBUG_MASK_HPD | > - EDP_PSR_DEBUG_MASK_LPSP | > - EDP_PSR_DEBUG_MASK_DISP_REG_WRITE | > - EDP_PSR_DEBUG_MASK_MAX_SLEEP); > } > + > + /* > + * Per Spec: Avoid continuous PSR exit by masking MEMUP and HPD also > + * mask LPSP to avoid dependency on other drivers that might block > + * runtime_pm besides preventing other hw tracking issues now we > + * can rely on frontbuffer tracking. > + */
Hmm.. I don't think I understand this comment completely and we should update it. This patch however looks correct, Reviewed-by: Dhinakaran Pandiyan <[email protected]> > + I915_WRITE(EDP_PSR_DEBUG, > + EDP_PSR_DEBUG_MASK_MEMUP | > + EDP_PSR_DEBUG_MASK_HPD | > + EDP_PSR_DEBUG_MASK_LPSP | > + EDP_PSR_DEBUG_MASK_DISP_REG_WRITE | > + EDP_PSR_DEBUG_MASK_MAX_SLEEP); > } > > static void intel_psr_enable_locked(struct drm_i915_private *dev_priv, _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
