From 54f7545cd7925db9ff78b9dccbff7406dd2ad4a4 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Marek=20Ol=C5=A1=C3=A1k?= <marek.olsak@amd.com>
Date: Wed, 30 Jan 2019 17:15:02 -0500
Subject: [PATCH] gallium/u_upload_mgr: allow use of FLUSH_EXPLICIT with
 persistent mappings
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

for radeonsi

Reviewed-by: Nicolai Hähnle <nicolai.haehnle@amd.com>
Tested-by: Dieter Nützel <Dieter@nuetzel-hh.de>
---
 src/gallium/auxiliary/util/u_upload_mgr.c | 33 +++++++++++++++++++++++++------
 src/gallium/auxiliary/util/u_upload_mgr.h |  4 ++++
 2 files changed, 31 insertions(+), 6 deletions(-)

diff --git a/src/gallium/auxiliary/util/u_upload_mgr.c b/src/gallium/auxiliary/util/u_upload_mgr.c
index f703852..c2c0ba9 100644
--- a/src/gallium/auxiliary/util/u_upload_mgr.c
+++ b/src/gallium/auxiliary/util/u_upload_mgr.c
@@ -53,6 +53,7 @@ struct u_upload_mgr {
    uint8_t *map;    /* Pointer to the mapped upload buffer. */
    unsigned offset; /* Aligned offset to the upload buffer, pointing
                      * at the first unused byte. */
+   unsigned flushed_size; /* Size we have flushed by transfer_flush_region. */
 };
 
 
@@ -102,27 +103,47 @@ u_upload_create_default(struct pipe_context *pipe)
 struct u_upload_mgr *
 u_upload_clone(struct pipe_context *pipe, struct u_upload_mgr *upload)
 {
-   return u_upload_create(pipe, upload->default_size, upload->bind,
-                          upload->usage, upload->flags);
+   struct u_upload_mgr *result = u_upload_create(pipe, upload->default_size,
+                                                 upload->bind, upload->usage,
+                                                 upload->flags);
+   if (upload->map_persistent &&
+       upload->map_flags & PIPE_TRANSFER_FLUSH_EXPLICIT)
+      u_upload_enable_flush_explicit(result);
+
+   return result;
+}
+
+void
+u_upload_enable_flush_explicit(struct u_upload_mgr *upload)
+{
+   assert(upload->map_persistent);
+   upload->map_flags &= ~PIPE_TRANSFER_COHERENT;
+   upload->map_flags |= PIPE_TRANSFER_FLUSH_EXPLICIT;
 }
 
 static void
 upload_unmap_internal(struct u_upload_mgr *upload, boolean destroying)
 {
-   if (!destroying && upload->map_persistent)
+   if (!upload->transfer)
       return;
 
-   if (upload->transfer) {
+   if (upload->map_flags & PIPE_TRANSFER_FLUSH_EXPLICIT) {
       struct pipe_box *box = &upload->transfer->box;
+      unsigned flush_offset = box->x + upload->flushed_size;
 
-      if (!upload->map_persistent && (int) upload->offset > box->x) {
+      if (upload->offset > flush_offset) {
          pipe_buffer_flush_mapped_range(upload->pipe, upload->transfer,
-                                        box->x, upload->offset - box->x);
+                                        flush_offset,
+                                        upload->offset - flush_offset);
+         upload->flushed_size = upload->offset;
       }
+   }
 
+   if (destroying || !upload->map_persistent) {
       pipe_transfer_unmap(upload->pipe, upload->transfer);
       upload->transfer = NULL;
       upload->map = NULL;
+      upload->flushed_size = 0;
    }
 }
 
diff --git a/src/gallium/auxiliary/util/u_upload_mgr.h b/src/gallium/auxiliary/util/u_upload_mgr.h
index a66b736..8083201 100644
--- a/src/gallium/auxiliary/util/u_upload_mgr.h
+++ b/src/gallium/auxiliary/util/u_upload_mgr.h
@@ -69,6 +69,10 @@ u_upload_create_default(struct pipe_context *pipe);
 struct u_upload_mgr *
 u_upload_clone(struct pipe_context *pipe, struct u_upload_mgr *upload);
 
+/** Whether to use FLUSH_EXPLICIT with persistent mappings. */
+void
+u_upload_enable_flush_explicit(struct u_upload_mgr *upload);
+
 /**
  * Destroy the upload manager.
  */
-- 
2.7.4