drm/i915/dg2: Add Wa_18018781329

A few more MOD registers need to be programmed on DG2.

Signed-off-by: Matt Roper <matthew.d.roper@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20220120234147.1200574-1-matthew.d.roper@intel.com
Reviewed-by: Swathi Dhanavanthri <swathi.dhanavanthri@intel.com>

diff --git a/drivers/gpu/drm/i915/gt/intel_workarounds.c b/drivers/gpu/drm/i915/gt/intel_workarounds.c
index ab3277a3d5939916a9b624ed23af977547ba4f26..930da3b4e0ebe099829e250f03e881a94ab68354 100644 (file)
--- a/drivers/gpu/drm/i915/gt/intel_workarounds.c
+++ b/drivers/gpu/drm/i915/gt/intel_workarounds.c
@@ -1508,6 +1508,12 @@ dg2_gt_workarounds_init(struct intel_gt *gt, struct i915_wa_list *wal)
         */
        wa_write_or(wal, XEHP_L3SCQREG7, BLEND_FILL_CACHING_OPT_DIS);
        wa_write_or(wal, GEN12_SQCM, EN_32B_ACCESS);
+
+       /* Wa_18018781329:dg2 */
+       wa_write_or(wal, RENDER_MOD_CTRL, FORCE_MISS_FTLB);
+       wa_write_or(wal, COMP_MOD_CTRL, FORCE_MISS_FTLB);
+       wa_write_or(wal, VDBX_MOD_CTRL, FORCE_MISS_FTLB);
+       wa_write_or(wal, VEBX_MOD_CTRL, FORCE_MISS_FTLB);
 }
 
 static void

diff --git a/drivers/gpu/drm/i915/i915_reg.h b/drivers/gpu/drm/i915/i915_reg.h
index 4c28dadf8d695b16e44da42745092c980bcb0371..5a7c9ae8001d2702f09f30578d20832baa9277a1 100644 (file)
--- a/drivers/gpu/drm/i915/i915_reg.h
+++ b/drivers/gpu/drm/i915/i915_reg.h
@@ -511,6 +511,10 @@ static inline bool i915_mmio_reg_valid(i915_reg_t reg)
 #define   TAG_BLOCK_CLKGATE_DIS                REG_BIT(7)
 
 #define GEN12_MERT_MOD_CTRL            _MMIO(0xcf28)
+#define RENDER_MOD_CTRL                        _MMIO(0xcf2c)
+#define COMP_MOD_CTRL                  _MMIO(0xcf30)
+#define VDBX_MOD_CTRL                  _MMIO(0xcf34)
+#define VEBX_MOD_CTRL                  _MMIO(0xcf38)
 #define   FORCE_MISS_FTLB              REG_BIT(3)
 
 #define GAB_CTL                                _MMIO(0x24000)