[PATCH 07/14] st-write-flush

[Chris Wilson]

---
 drivers/gpu/drm/i915/gem/selftests/i915_gem_context.c | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/drivers/gpu/drm/i915/gem/selftests/i915_gem_context.c b/drivers/gpu/drm/i915/gem/selftests/i915_gem_context.c
index d3f87dc4eda3..118d00acf3d1 100644
--- a/drivers/gpu/drm/i915/gem/selftests/i915_gem_context.c
+++ b/drivers/gpu/drm/i915/gem/selftests/i915_gem_context.c
@@ -1709,12 +1709,6 @@ static int read_from_scratch(struct i915_gem_context *ctx,
 
 	i915_request_add(rq);
 
-	i915_gem_object_lock(obj, NULL);
-	err = i915_gem_object_set_to_cpu_domain(obj, false);
-	i915_gem_object_unlock(obj);
-	if (err)
-		goto out_vm;
-
 	cmd = i915_gem_object_pin_map(obj, I915_MAP_WB);
 	if (IS_ERR(cmd)) {
 		err = PTR_ERR(cmd);
@@ -1722,6 +1716,7 @@ static int read_from_scratch(struct i915_gem_context *ctx,
 	}
 
 	*value = cmd[result / sizeof(*cmd)];
+	i915_gem_object_flush_map(obj);
 	i915_gem_object_unpin_map(obj);
 
 	goto out_vm;
-- 
2.20.1