Merge drm/drm-next into drm-intel-next

[platform/kernel/linux-starfive.git] / drivers / gpu / drm / i915 / i915_reg.h

diff --git a/drivers/gpu/drm/i915/i915_reg.h b/drivers/gpu/drm/i915/i915_reg.h
index ca549d7..174dc15 100644 (file)
--- a/drivers/gpu/drm/i915/i915_reg.h
+++ b/drivers/gpu/drm/i915/i915_reg.h
@@ -8228,6 +8228,7 @@ enum {
 #define  GEN11_LQSC_CLEAN_EVICT_DISABLE                (1 << 6)
 #define  GEN8_LQSC_RO_PERF_DIS                 (1 << 27)
 #define  GEN8_LQSC_FLUSH_COHERENT_LINES                (1 << 21)
+#define  GEN8_LQSQ_NONIA_COHERENT_ATOMICS_ENABLE REG_BIT(22)
 
 /* GEN8 chicken */
 #define HDC_CHICKEN0                           _MMIO(0x7300)
@@ -12152,6 +12153,12 @@ enum skl_power_gate {
 #define __GEN11_VCS2_MOCS0     0x10000
 #define GEN11_MFX2_MOCS(i)     _MMIO(__GEN11_VCS2_MOCS0 + (i) * 4)
 
+#define GEN9_SCRATCH_LNCF1             _MMIO(0xb008)
+#define   GEN9_LNCF_NONIA_COHERENT_ATOMICS_ENABLE REG_BIT(0)
+
+#define GEN9_SCRATCH1                  _MMIO(0xb11c)
+#define   EVICTION_PERF_FIX_ENABLE     REG_BIT(8)
+
 #define GEN10_SCRATCH_LNCF2            _MMIO(0xb0a0)
 #define   PMFLUSHDONE_LNICRSDROP       (1 << 20)
 #define   PMFLUSH_GAPL3UNBLOCK         (1 << 21)