Merge tag 'drm-intel-next-2022-06-22' of git://anongit.freedesktop.org/drm/drm-intel...

[J-linux.git] / drivers / gpu / drm / i915 / display / intel_fbc.c

diff --git a/drivers/gpu/drm/i915/display/intel_fbc.c b/drivers/gpu/drm/i915/display/intel_fbc.c
index 6efae745ca5ac244aa1be02f28619f3fe9b3ee53..16537830ccf013353065188b92539f4e7e151a7d 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_fbc.c
+++ b/drivers/gpu/drm/i915/display/intel_fbc.c
@@ -814,8 +814,8 @@ static void intel_fbc_program_cfb(struct intel_fbc *fbc)
 
 static void intel_fbc_program_workarounds(struct intel_fbc *fbc)
 {
-       /* Wa_22014263786:icl,jsl,tgl,dg1,rkl,adls,dg2,adlp */
-       if (DISPLAY_VER(fbc->i915) >= 11)
+       /* Wa_22014263786:icl,jsl,tgl,dg1,rkl,adls,adlp */
+       if (DISPLAY_VER(fbc->i915) >= 11 && !IS_DG2(fbc->i915))
                intel_de_rmw(fbc->i915, ILK_DPFC_CHICKEN(fbc->id), 0,
                             DPFC_CHICKEN_FORCE_SLB_INVALIDATION);
 }