drm/i915: Reduce engine->emit_flush() to a single mode parameter

Rather than passing a complete set of GPU cache domains for either
invalidation or for flushing, or even both, just pass a single parameter
to the engine->emit_flush to determine the required operations.

engine->emit_flush(GPU, 0) -> engine->emit_flush(EMIT_INVALIDATE)
engine->emit_flush(0, GPU) -> engine->emit_flush(EMIT_FLUSH)
engine->emit_flush(GPU, GPU) -> engine->emit_flush(EMIT_FLUSH | EMIT_INVALIDATE)

This allows us to extend the behaviour easily in future, for example if
we want just a command barrier without the overhead of flushing.

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Dave Gordon <david.s.gordon@intel.com>
Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Reviewed-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/1470174640-18242-8-git-send-email-chris@chris-wilson.co.uk

1 files changed, 8 insertions, 15 deletions

diff --git a/drivers/gpu/drm/i915/intel_lrc.c b/drivers/gpu/drm/i915/intel_lrc.c
index e8d971e81491..af7d7e07748e 100644
--- a/drivers/gpu/drm/i915/intel_lrc.c
+++ b/drivers/gpu/drm/i915/intel_lrc.c
@@ -672,7 +672,7 @@ static int execlists_move_to_gpu(struct drm_i915_gem_request *req,
         /* Unconditionally invalidate gpu caches and ensure that we do flush
          * any residual writes from the previous batch.
          */
-        return req->engine->emit_flush(req, I915_GEM_GPU_DOMAINS, 0);
+        return req->engine->emit_flush(req, EMIT_INVALIDATE);
 }
 
 int intel_logical_ring_alloc_request_extras(struct drm_i915_gem_request *request)
@@ -998,9 +998,7 @@ static int intel_logical_ring_workarounds_emit(struct drm_i915_gem_request *req)
         if (w->count == 0)
                 return 0;
 
-        ret = req->engine->emit_flush(req,
-                                      I915_GEM_GPU_DOMAINS,
-                                      I915_GEM_GPU_DOMAINS);
+        ret = req->engine->emit_flush(req, EMIT_BARRIER);
         if (ret)
                 return ret;
 
@@ -1017,9 +1015,7 @@ static int intel_logical_ring_workarounds_emit(struct drm_i915_gem_request *req)
 
         intel_ring_advance(ring);
 
-        ret = req->engine->emit_flush(req,
-                                      I915_GEM_GPU_DOMAINS,
-                                      I915_GEM_GPU_DOMAINS);
+        ret = req->engine->emit_flush(req, EMIT_BARRIER);
         if (ret)
                 return ret;
 
@@ -1598,9 +1594,7 @@ static void gen8_logical_ring_disable_irq(struct intel_engine_cs *engine)
         I915_WRITE_IMR(engine, ~engine->irq_keep_mask);
 }
 
-static int gen8_emit_flush(struct drm_i915_gem_request *request,
-                           u32 invalidate_domains,
-                           u32 unused)
+static int gen8_emit_flush(struct drm_i915_gem_request *request, u32 mode)
 {
         struct intel_ring *ring = request->ring;
         u32 cmd;
@@ -1619,7 +1613,7 @@ static int gen8_emit_flush(struct drm_i915_gem_request *request,
          */
         cmd |= MI_FLUSH_DW_STORE_INDEX | MI_FLUSH_DW_OP_STOREDW;
 
-        if (invalidate_domains & I915_GEM_GPU_DOMAINS) {
+        if (mode & EMIT_INVALIDATE) {
                 cmd |= MI_INVALIDATE_TLB;
                 if (request->engine->id == VCS)
                         cmd |= MI_INVALIDATE_BSD;
@@ -1637,8 +1631,7 @@ static int gen8_emit_flush(struct drm_i915_gem_request *request,
 }
 
 static int gen8_emit_flush_render(struct drm_i915_gem_request *request,
-                                  u32 invalidate_domains,
-                                  u32 flush_domains)
+                                  u32 mode)
 {
         struct intel_ring *ring = request->ring;
         struct intel_engine_cs *engine = request->engine;
@@ -1650,14 +1643,14 @@ static int gen8_emit_flush_render(struct drm_i915_gem_request *request,
 
         flags |= PIPE_CONTROL_CS_STALL;
 
-        if (flush_domains) {
+        if (mode & EMIT_FLUSH) {
                 flags |= PIPE_CONTROL_RENDER_TARGET_CACHE_FLUSH;
                 flags |= PIPE_CONTROL_DEPTH_CACHE_FLUSH;
                 flags |= PIPE_CONTROL_DC_FLUSH_ENABLE;
                 flags |= PIPE_CONTROL_FLUSH_ENABLE;
         }
 
-        if (invalidate_domains) {
+        if (mode & EMIT_INVALIDATE) {
                 flags |= PIPE_CONTROL_TLB_INVALIDATE;
                 flags |= PIPE_CONTROL_INSTRUCTION_CACHE_INVALIDATE;
                 flags |= PIPE_CONTROL_TEXTURE_CACHE_INVALIDATE;