drm/i915: Flush the context object from the CPU caches upon switching

The issue is that we stale data in the CPU caches, when we come to
swap-out the object, the CPU may short-circuit the reads from those
cacheline and so corrupt the context object.

Secondary, leaving the context object as being marked in the CPU write
domain whilst on the GPU active list is a bad idea and will throw
warnings later.

Note: Thanks to calling set_to_gtt_domain with write = false and not
setting any gpu write domain when putting a context object onto the
active list (when we switch away from it) the set_to_gtt_domain call
won't block.

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Reviewed-by: Ben Widawsky <ben@bwidawsk.net>
[danvet: Added a note to the commit message and a comment in the code
to explain the clever non-blocking trick.]
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>

diff --git a/drivers/gpu/drm/i915/i915_gem_context.c b/drivers/gpu/drm/i915/i915_gem_context.c
index 18eee8d2522de91e1105ebc1f0c88b8376483fe1..65639ad728086b26ea800b34ce1f7779477ae309 100644 (file)
--- a/drivers/gpu/drm/i915/i915_gem_context.c
+++ b/drivers/gpu/drm/i915/i915_gem_context.c
@@ -374,6 +374,17 @@ static int do_switch(struct drm_i915_gem_object *from_obj,
        if (ret)
                return ret;
 
+       /* Clear this page out of any CPU caches for coherent swap-in/out. Note
+        * that thanks to write = false in this call and us not setting any gpu
+        * write domains when putting a context object onto the active list
+        * (when switching away from it), this won't block.
+        * XXX: We need a real interface to do this instead of trickery. */
+       ret = i915_gem_object_set_to_gtt_domain(to->obj, false);
+       if (ret) {
+               i915_gem_object_unpin(to->obj);
+               return ret;
+       }
+
        if (!to->obj->has_global_gtt_mapping)
                i915_gem_gtt_bind_object(to->obj, to->obj->cache_level);