On Fri, 2021-07-16 at 22:14 -0700, Matt Roper wrote: > RKL doesn't have PSR2 support, so PSR2-related workarounds no longer > apply.
Reviewed-by: José Roberto de Souza <[email protected]> > > Bspec: 53273 > Signed-off-by: Matt Roper <[email protected]> > --- > drivers/gpu/drm/i915/display/intel_psr.c | 10 ++++------ > 1 file changed, 4 insertions(+), 6 deletions(-) > > diff --git a/drivers/gpu/drm/i915/display/intel_psr.c > b/drivers/gpu/drm/i915/display/intel_psr.c > index d436490ab28c..0a3d42c8d47d 100644 > --- a/drivers/gpu/drm/i915/display/intel_psr.c > +++ b/drivers/gpu/drm/i915/display/intel_psr.c > @@ -592,9 +592,8 @@ static void hsw_activate_psr2(struct intel_dp *intel_dp) > val |= EDP_PSR2_SU_SDP_SCANLINE; > > if (intel_dp->psr.psr2_sel_fetch_enabled) { > - /* WA 1408330847 */ > - if (IS_TGL_DISPLAY_STEP(dev_priv, STEP_A0, STEP_A0) || > - IS_RKL_DISPLAY_STEP(dev_priv, STEP_A0, STEP_A0)) > + /* Wa_1408330847 */ > + if (IS_TGL_DISPLAY_STEP(dev_priv, STEP_A0, STEP_A0)) > intel_de_rmw(dev_priv, CHICKEN_PAR1_1, > DIS_RAM_BYPASS_PSR2_MAN_TRACK, > DIS_RAM_BYPASS_PSR2_MAN_TRACK); > @@ -1339,10 +1338,9 @@ static void intel_psr_disable_locked(struct intel_dp > *intel_dp) > intel_psr_exit(intel_dp); > intel_psr_wait_exit_locked(intel_dp); > > - /* WA 1408330847 */ > + /* Wa_1408330847 */ > if (intel_dp->psr.psr2_sel_fetch_enabled && > - (IS_TGL_DISPLAY_STEP(dev_priv, STEP_A0, STEP_A0) || > - IS_RKL_DISPLAY_STEP(dev_priv, STEP_A0, STEP_A0))) > + IS_TGL_DISPLAY_STEP(dev_priv, STEP_A0, STEP_A0)) > intel_de_rmw(dev_priv, CHICKEN_PAR1_1, > DIS_RAM_BYPASS_PSR2_MAN_TRACK, 0); > _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
