diff --git a/src/gallium/docs/source/context.rst b/src/gallium/docs/source/context.rst
index 05c6f11ea48..8fb621bcac3 100644
--- a/src/gallium/docs/source/context.rst
+++ b/src/gallium/docs/source/context.rst
@@ -463,6 +463,16 @@ Flushing
 
 ``flush``
 
+PIPE_FLUSH_END_OF_FRAME: Whether the flush marks the end of frame.
+
+PIPE_FLUSH_DEFERRED: It is not required to flush right away, but it is required
+to return a valid fence. The behavior of fence_finish or any other call isn't
+changed. The only side effect can be that fence_finish will wait a little
+longer. No guidance is given as to how drivers should implement fence_finish
+with deferred flushes. If some drivers can't do deferred flushes safely, they
+should just ignore the flag.
+
+
 
 ``flush_resource``
 
diff --git a/src/gallium/include/pipe/p_defines.h b/src/gallium/include/pipe/p_defines.h
index 3ab6c2f62b0..2524e424d7b 100644
--- a/src/gallium/include/pipe/p_defines.h
+++ b/src/gallium/include/pipe/p_defines.h
@@ -348,7 +348,8 @@ enum pipe_transfer_usage
  */
 enum pipe_flush_flags
 {
-   PIPE_FLUSH_END_OF_FRAME = (1 << 0)
+   PIPE_FLUSH_END_OF_FRAME = (1 << 0),
+   PIPE_FLUSH_DEFERRED = (1 << 1),
 };
 
 /**
diff --git a/src/mesa/state_tracker/st_cb_syncobj.c b/src/mesa/state_tracker/st_cb_syncobj.c
index ec2687fba53..69f2a289ada 100644
--- a/src/mesa/state_tracker/st_cb_syncobj.c
+++ b/src/mesa/state_tracker/st_cb_syncobj.c
@@ -73,7 +73,7 @@ static void st_fence_sync(struct gl_context *ctx, struct gl_sync_object *obj,
    assert(condition == GL_SYNC_GPU_COMMANDS_COMPLETE && flags == 0);
    assert(so->fence == NULL);
 
-   pipe->flush(pipe, &so->fence, 0);
+   pipe->flush(pipe, &so->fence, PIPE_FLUSH_DEFERRED);
 }
 
 static void st_check_sync(struct gl_context *ctx, struct gl_sync_object *obj)