This will fix a memory coherence issue.

BSpec: 52890
Signed-off-by: José Roberto de Souza <[email protected]>
---
 drivers/gpu/drm/i915/gt/intel_workarounds.c |  6 ++++++
 drivers/gpu/drm/i915/i915_reg.h             | 20 +++++++++++---------
 2 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/drivers/gpu/drm/i915/gt/intel_workarounds.c 
b/drivers/gpu/drm/i915/gt/intel_workarounds.c
index 164b5e82e3e3..b3bb3dd90f02 100644
--- a/drivers/gpu/drm/i915/gt/intel_workarounds.c
+++ b/drivers/gpu/drm/i915/gt/intel_workarounds.c
@@ -606,6 +606,12 @@ static void tgl_ctx_workarounds_init(struct 
intel_engine_cs *engine,
        wa_add(wal, FF_MODE2, FF_MODE2_TDS_TIMER_MASK, val,
               IS_TGL_GT_REVID(engine->i915, TGL_GT_REVID_A0,
                               TGL_GT_REVID_A0) ? 0 : FF_MODE2_TDS_TIMER_MASK);
+
+       /* Wa_1407901919:tgl */
+       wa_add(wal, ICL_HDC_MODE, HDC_COHERENT_ACCESS_L1_CACHE_DIS |
+              HDC_DIS_L1_INVAL_FOR_NON_L1_CACHEABLE_W, 0,
+              HDC_COHERENT_ACCESS_L1_CACHE_DIS |
+              HDC_DIS_L1_INVAL_FOR_NON_L1_CACHEABLE_W);
 }
 
 static void
diff --git a/drivers/gpu/drm/i915/i915_reg.h b/drivers/gpu/drm/i915/i915_reg.h
index e2abd910ae80..3f592636f982 100644
--- a/drivers/gpu/drm/i915/i915_reg.h
+++ b/drivers/gpu/drm/i915/i915_reg.h
@@ -7892,15 +7892,17 @@ enum {
 #define  GEN8_LQSC_FLUSH_COHERENT_LINES                (1 << 21)
 
 /* GEN8 chicken */
-#define HDC_CHICKEN0                           _MMIO(0x7300)
-#define CNL_HDC_CHICKEN0                       _MMIO(0xE5F0)
-#define ICL_HDC_MODE                           _MMIO(0xE5F4)
-#define  HDC_FORCE_CSR_NON_COHERENT_OVR_DISABLE        (1 << 15)
-#define  HDC_FENCE_DEST_SLM_DISABLE            (1 << 14)
-#define  HDC_DONOT_FETCH_MEM_WHEN_MASKED       (1 << 11)
-#define  HDC_FORCE_CONTEXT_SAVE_RESTORE_NON_COHERENT   (1 << 5)
-#define  HDC_FORCE_NON_COHERENT                        (1 << 4)
-#define  HDC_BARRIER_PERFORMANCE_DISABLE       (1 << 10)
+#define HDC_CHICKEN0                                   _MMIO(0x7300)
+#define CNL_HDC_CHICKEN0                               _MMIO(0xE5F0)
+#define ICL_HDC_MODE                                   _MMIO(0xE5F4)
+#define  HDC_FORCE_CSR_NON_COHERENT_OVR_DISABLE                REG_BIT(15)
+#define  HDC_FENCE_DEST_SLM_DISABLE                    REG_BIT(14)
+#define  HDC_DIS_L1_INVAL_FOR_NON_L1_CACHEABLE_W       REG_BIT(13)
+#define  HDC_COHERENT_ACCESS_L1_CACHE_DIS              REG_BIT(12)
+#define  HDC_DONOT_FETCH_MEM_WHEN_MASKED               REG_BIT(11)
+#define  HDC_FORCE_CONTEXT_SAVE_RESTORE_NON_COHERENT   REG_BIT(5)
+#define  HDC_FORCE_NON_COHERENT                                REG_BIT(4)
+#define  HDC_BARRIER_PERFORMANCE_DISABLE               REG_BIT(10)
 
 #define GEN8_HDC_CHICKEN1                      _MMIO(0x7304)
 
-- 
2.25.1

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

Reply via email to