[PATCH 11/14] st-wa-write

[Chris Wilson]

---
 drivers/gpu/drm/i915/gt/selftest_workarounds.c | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/drivers/gpu/drm/i915/gt/selftest_workarounds.c b/drivers/gpu/drm/i915/gt/selftest_workarounds.c
index 2070b91cb607..240c8a737daa 100644
--- a/drivers/gpu/drm/i915/gt/selftest_workarounds.c
+++ b/drivers/gpu/drm/i915/gt/selftest_workarounds.c
@@ -205,7 +205,6 @@ static int check_whitelist(struct intel_context *ce)
 {
 	struct intel_engine_cs *engine = ce->engine;
 	struct drm_i915_gem_object *results;
-	struct intel_wedge_me wedge;
 	u32 *vaddr;
 	int err;
 	int i;
@@ -214,15 +213,10 @@ static int check_whitelist(struct intel_context *ce)
 	if (IS_ERR(results))
 		return PTR_ERR(results);
 
-	err = 0;
-	i915_gem_object_lock(results, NULL);
-	intel_wedge_on_timeout(&wedge, engine->gt, HZ / 5) /* safety net! */
-		err = i915_gem_object_set_to_cpu_domain(results, false);
-	i915_gem_object_unlock(results);
-	if (intel_gt_is_wedged(engine->gt))
+	if (igt_flush_test(engine->i915)) {
 		err = -EIO;
-	if (err)
 		goto out_put;
+	}
 
 	vaddr = i915_gem_object_pin_map(results, I915_MAP_WB);
 	if (IS_ERR(vaddr)) {
-- 
2.20.1