drm/i915: Split i915_gem_flush_ring() into seperate invalidate/flush funcs

By moving the function to intel_ringbuffer and currying the appropriate
parameter, hopefully we make the callsites easier to read and
understand.

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>

1 files changed, 3 insertions, 26 deletions

diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c
index 3659d47a9f6e..f26e2b201bad 100644
--- a/drivers/gpu/drm/i915/i915_gem.c
+++ b/drivers/gpu/drm/i915/i915_gem.c
@@ -1549,13 +1549,9 @@ i915_add_request(struct intel_ring_buffer *ring,
          * is that the flush _must_ happen before the next request, no matter
          * what.
          */
-        if (ring->gpu_caches_dirty) {
-                ret = i915_gem_flush_ring(ring, 0, I915_GEM_GPU_DOMAINS);
-                if (ret)
-                        return ret;
-
-                ring->gpu_caches_dirty = false;
-        }
+        ret = intel_ring_flush_all_caches(ring);
+        if (ret)
+                return ret;
 
         if (request == NULL) {
                 request = kmalloc(sizeof(*request), GFP_KERNEL);
@@ -2254,25 +2250,6 @@ i915_gem_object_unbind(struct drm_i915_gem_object *obj)
         return ret;
 }
 
-int
-i915_gem_flush_ring(struct intel_ring_buffer *ring,
-                    uint32_t invalidate_domains,
-                    uint32_t flush_domains)
-{
-        int ret;
-
-        if (((invalidate_domains | flush_domains) & I915_GEM_GPU_DOMAINS) == 0)
-                return 0;
-
-        trace_i915_gem_ring_flush(ring, invalidate_domains, flush_domains);
-
-        ret = ring->flush(ring, invalidate_domains, flush_domains);
-        if (ret)
-                return ret;
-
-        return 0;
-}
-
 static int i915_ring_idle(struct intel_ring_buffer *ring)
 {
         if (list_empty(&ring->active_list))