aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/gpu/drm/i915/i915_perf.c1
-rw-r--r--drivers/gpu/drm/i915/i915_reg.h1
2 files changed, 2 insertions, 0 deletions
diff --git a/drivers/gpu/drm/i915/i915_perf.c b/drivers/gpu/drm/i915/i915_perf.c
index 39a4804091d7..dc4ce694c06a 100644
--- a/drivers/gpu/drm/i915/i915_perf.c
+++ b/drivers/gpu/drm/i915/i915_perf.c
@@ -3005,6 +3005,7 @@ static bool gen8_is_valid_mux_addr(struct drm_i915_private *dev_priv, u32 addr)
3005static bool gen10_is_valid_mux_addr(struct drm_i915_private *dev_priv, u32 addr) 3005static bool gen10_is_valid_mux_addr(struct drm_i915_private *dev_priv, u32 addr)
3006{ 3006{
3007 return gen8_is_valid_mux_addr(dev_priv, addr) || 3007 return gen8_is_valid_mux_addr(dev_priv, addr) ||
3008 addr == i915_mmio_reg_offset(GEN10_NOA_WRITE_HIGH) ||
3008 (addr >= i915_mmio_reg_offset(OA_PERFCNT3_LO) && 3009 (addr >= i915_mmio_reg_offset(OA_PERFCNT3_LO) &&
3009 addr <= i915_mmio_reg_offset(OA_PERFCNT4_HI)); 3010 addr <= i915_mmio_reg_offset(OA_PERFCNT4_HI));
3010} 3011}
diff --git a/drivers/gpu/drm/i915/i915_reg.h b/drivers/gpu/drm/i915/i915_reg.h
index 2aa69d347ec4..13d6bd4e17b2 100644
--- a/drivers/gpu/drm/i915/i915_reg.h
+++ b/drivers/gpu/drm/i915/i915_reg.h
@@ -1062,6 +1062,7 @@ static inline bool i915_mmio_reg_valid(i915_reg_t reg)
1062 1062
1063#define NOA_DATA _MMIO(0x986C) 1063#define NOA_DATA _MMIO(0x986C)
1064#define NOA_WRITE _MMIO(0x9888) 1064#define NOA_WRITE _MMIO(0x9888)
1065#define GEN10_NOA_WRITE_HIGH _MMIO(0x9884)
1065 1066
1066#define _GEN7_PIPEA_DE_LOAD_SL 0x70068 1067#define _GEN7_PIPEA_DE_LOAD_SL 0x70068
1067#define _GEN7_PIPEB_DE_LOAD_SL 0x71068 1068#define _GEN7_PIPEB_DE_LOAD_SL 0x71068