[PATCH 01/35] drm/i915: Restore Braswell GGTT update w/a

[Chris Wilson]

Having recently changed the Kconfig on my Braswell to use intel_iommu
once again, the gem_concurrent_blit corruption has resurfaced. With that
clue and the report that Broxton suffers a similar fate with intel_iommu
active, we are finally able to piece the two together and determine that
Braswell needs the same vtd workaround.

Fixes: 4509276ee824 ("drm/i915: Remove Braswell GGTT update w/a")
References: 0ef34ad6222a ("drm/i915: Serialize GTT/Aperture accesses on BXT")
Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>
Cc: Daniel Vetter <daniel.vetter at ffwll.ch>
Cc: Joonas Lahtinen <joonas.lahtinen at linux.intel.com>
Cc: Jani Nikula <jani.nikula at linux.intel.com>
Cc: Rodrigo Vivi <rodrigo.vivi at intel.com>
---
 drivers/gpu/drm/i915/i915_drv.h     |  3 +-
 drivers/gpu/drm/i915/i915_gem_gtt.c | 77 +++++--------------------------------
 2 files changed, 12 insertions(+), 68 deletions(-)

diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
index 594fd14e66c5..b6c6681ccf55 100644
--- a/drivers/gpu/drm/i915/i915_drv.h
+++ b/drivers/gpu/drm/i915/i915_drv.h
@@ -3306,7 +3306,8 @@ static inline bool intel_scanout_needs_vtd_wa(struct drm_i915_private *dev_priv)
 static inline bool
 intel_ggtt_update_needs_vtd_wa(struct drm_i915_private *dev_priv)
 {
-	return IS_BROXTON(dev_priv) && intel_vtd_active();
+	return (IS_CHERRYVIEW(dev_priv) || IS_BROXTON(dev_priv)) &&
+		intel_vtd_active();
 }
 
 int intel_sanitize_enable_ppgtt(struct drm_i915_private *dev_priv,
diff --git a/drivers/gpu/drm/i915/i915_gem_gtt.c b/drivers/gpu/drm/i915/i915_gem_gtt.c
index f3c35e826321..2ec3955db3b7 100644
--- a/drivers/gpu/drm/i915/i915_gem_gtt.c
+++ b/drivers/gpu/drm/i915/i915_gem_gtt.c
@@ -2470,7 +2470,7 @@ static void gen8_ggtt_clear_range(struct i915_address_space *vm,
 		gen8_set_pte(&gtt_base[i], scratch_pte);
 }
 
-static void bxt_vtd_ggtt_wa(struct i915_address_space *vm)
+static void gen8_vtd_ggtt_wa(struct i915_address_space *vm)
 {
 	struct drm_i915_private *dev_priv = vm->i915;
 
@@ -2484,83 +2484,30 @@ static void bxt_vtd_ggtt_wa(struct i915_address_space *vm)
 	POSTING_READ(GFX_FLSH_CNTL_GEN6);
 }
 
-struct insert_page {
-	struct i915_address_space *vm;
-	dma_addr_t addr;
-	u64 offset;
-	enum i915_cache_level level;
-};
-
-static int bxt_vtd_ggtt_insert_page__cb(void *_arg)
-{
-	struct insert_page *arg = _arg;
-
-	gen8_ggtt_insert_page(arg->vm, arg->addr, arg->offset, arg->level, 0);
-	bxt_vtd_ggtt_wa(arg->vm);
-
-	return 0;
-}
-
-static void bxt_vtd_ggtt_insert_page__BKL(struct i915_address_space *vm,
-					  dma_addr_t addr,
-					  u64 offset,
-					  enum i915_cache_level level,
-					  u32 unused)
-{
-	struct insert_page arg = { vm, addr, offset, level };
-
-	stop_machine(bxt_vtd_ggtt_insert_page__cb, &arg, NULL);
-}
-
 struct insert_entries {
 	struct i915_address_space *vm;
 	struct i915_vma *vma;
 	enum i915_cache_level level;
 };
 
-static int bxt_vtd_ggtt_insert_entries__cb(void *_arg)
+static int gen8_vtd_ggtt_insert_entries__cb(void *_arg)
 {
 	struct insert_entries *arg = _arg;
 
 	gen8_ggtt_insert_entries(arg->vm, arg->vma, arg->level, 0);
-	bxt_vtd_ggtt_wa(arg->vm);
+	gen8_vtd_ggtt_wa(arg->vm);
 
 	return 0;
 }
 
-static void bxt_vtd_ggtt_insert_entries__BKL(struct i915_address_space *vm,
-					     struct i915_vma *vma,
-					     enum i915_cache_level level,
-					     u32 unused)
+static void gen8_vtd_ggtt_insert_entries__BKL(struct i915_address_space *vm,
+					      struct i915_vma *vma,
+					      enum i915_cache_level level,
+					      u32 unused)
 {
 	struct insert_entries arg = { vm, vma, level };
 
-	stop_machine(bxt_vtd_ggtt_insert_entries__cb, &arg, NULL);
-}
-
-struct clear_range {
-	struct i915_address_space *vm;
-	u64 start;
-	u64 length;
-};
-
-static int bxt_vtd_ggtt_clear_range__cb(void *_arg)
-{
-	struct clear_range *arg = _arg;
-
-	gen8_ggtt_clear_range(arg->vm, arg->start, arg->length);
-	bxt_vtd_ggtt_wa(arg->vm);
-
-	return 0;
-}
-
-static void bxt_vtd_ggtt_clear_range__BKL(struct i915_address_space *vm,
-					  u64 start,
-					  u64 length)
-{
-	struct clear_range arg = { vm, start, length };
-
-	stop_machine(bxt_vtd_ggtt_clear_range__cb, &arg, NULL);
+	stop_machine(gen8_vtd_ggtt_insert_entries__cb, &arg, NULL);
 }
 
 static void gen6_ggtt_clear_range(struct i915_address_space *vm,
@@ -3368,12 +3315,8 @@ static int gen8_gmch_probe(struct i915_ggtt *ggtt)
 	ggtt->base.insert_entries = gen8_ggtt_insert_entries;
 
 	/* Serialize GTT updates with aperture access on BXT if VT-d is on. */
-	if (intel_ggtt_update_needs_vtd_wa(dev_priv)) {
-		ggtt->base.insert_entries = bxt_vtd_ggtt_insert_entries__BKL;
-		ggtt->base.insert_page    = bxt_vtd_ggtt_insert_page__BKL;
-		if (ggtt->base.clear_range != nop_clear_range)
-			ggtt->base.clear_range = bxt_vtd_ggtt_clear_range__BKL;
-	}
+	if (intel_ggtt_update_needs_vtd_wa(dev_priv))
+		ggtt->base.insert_entries = gen8_vtd_ggtt_insert_entries__BKL;
 
 	ggtt->invalidate = gen6_ggtt_invalidate;
 
-- 
2.15.1