Message ID | 20220907232541.1720966-1-lucas.demarchi@intel.com (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
Series | [v2] Revert "drm/i915/dg2: extend Wa_1409120013 to DG2" | expand |
On Wed, Sep 07, 2022 at 04:25:42PM -0700, Lucas De Marchi wrote: >This reverts commit 487970e8bb776c989013bb59d6cbb22e45b9afc6. > >Updated bspec and workaround database note Wa_1409120013 is not needed >for DG2 (or any Xe_LPD) platform. Simply check by display version 12. > >v2: Simplify condition check to display version (Matt Roper) > >Cc: Matt Atwood <matthew.s.atwood@intel.com> >Cc: Clint Taylor <Clinton.A.Taylor@intel.com> >Signed-off-by: Lucas De Marchi <lucas.demarchi@intel.com> >Reviewed-by: Matt Roper <matthew.d.roper@intel.com> >--- > drivers/gpu/drm/i915/intel_pm.c | 5 ++--- +Joonas heads up that being a WA I ended up merging this through drm-intel-gt-next. On a hindsight that should probably had gone through drm-intel-next instead since it's a display workaround touching drivers/gpu/drm/i915/intel_pm.c and not the more usual drivers/gpu/drm/i915/gt/intel_workarounds.c Lucas De Marchi
diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c index 210c1f78cc90..eb9c54bbf51f 100644 --- a/drivers/gpu/drm/i915/intel_pm.c +++ b/drivers/gpu/drm/i915/intel_pm.c @@ -7614,9 +7614,8 @@ static void icl_init_clock_gating(struct drm_i915_private *dev_priv) static void gen12lp_init_clock_gating(struct drm_i915_private *dev_priv) { - /* Wa_1409120013:tgl,rkl,adl-s,dg1,dg2 */ - if (IS_TIGERLAKE(dev_priv) || IS_ROCKETLAKE(dev_priv) || - IS_ALDERLAKE_S(dev_priv) || IS_DG1(dev_priv) || IS_DG2(dev_priv)) + /* Wa_1409120013 */ + if (DISPLAY_VER(dev_priv) == 12) intel_uncore_write(&dev_priv->uncore, ILK_DPFC_CHICKEN(INTEL_FBC_A), DPFC_CHICKEN_COMP_DUMMY_PIXEL);