radeonsi: flush the context after resource_copy_region for buffer exports

Cc: 17.2 17.3 <mesa-stable@lists.freedesktop.org>
Reviewed-by: Nicolai Hähnle <nicolai.haehnle@amd.com>

diff --git a/src/gallium/drivers/radeon/r600_texture.c b/src/gallium/drivers/radeon/r600_texture.c
index 86a2e1b9a5eec812ee62594bdb75160c7a5d3b0f..2aa47b55d592bacd78485e35c295b5ccef3592d8 100644 (file)
--- a/src/gallium/drivers/radeon/r600_texture.c
+++ b/src/gallium/drivers/radeon/r600_texture.c
@@ -673,6 +673,7 @@ static boolean r600_texture_get_handle(struct pipe_screen* screen,
        struct radeon_bo_metadata metadata;
        bool update_metadata = false;
        unsigned stride, offset, slice_size;
+       bool flush = false;
 
        ctx = threaded_context_unwrap_sync(ctx);
        rctx = (struct r600_common_context*)(ctx ? ctx : sscreen->aux_context);
@@ -692,7 +693,7 @@ static boolean r600_texture_get_handle(struct pipe_screen* screen,
                        assert(!res->b.is_shared);
                        r600_reallocate_texture_inplace(rctx, rtex,
                                                        PIPE_BIND_SHARED, false);
-                       rctx->b.flush(&rctx->b, NULL, 0);
+                       flush = true;
                        assert(res->b.b.bind & PIPE_BIND_SHARED);
                        assert(res->flags & RADEON_FLAG_NO_SUBALLOC);
                        assert(!(res->flags & RADEON_FLAG_NO_INTERPROCESS_SHARING));
@@ -704,14 +705,19 @@ static boolean r600_texture_get_handle(struct pipe_screen* screen,
                 * access.
                 */
                if (usage & PIPE_HANDLE_USAGE_WRITE && rtex->dcc_offset) {
-                       if (si_texture_disable_dcc(rctx, rtex))
+                       if (si_texture_disable_dcc(rctx, rtex)) {
                                update_metadata = true;
+                               /* si_texture_disable_dcc flushes the context */
+                               flush = false;
+                       }
                }
 
                if (!(usage & PIPE_HANDLE_USAGE_EXPLICIT_FLUSH) &&
                    (rtex->cmask.size || rtex->dcc_offset)) {
                        /* Eliminate fast clear (both CMASK and DCC) */
                        r600_eliminate_fast_color_clear(rctx, rtex);
+                       /* eliminate_fast_color_clear flushes the context */
+                       flush = false;
 
                        /* Disable CMASK if flush_resource isn't going
                         * to be called.
@@ -758,6 +764,7 @@ static boolean r600_texture_get_handle(struct pipe_screen* screen,
                        u_box_1d(0, newb->width0, &box);
                        rctx->b.resource_copy_region(&rctx->b, newb, 0, 0, 0, 0,
                                                     &res->b.b, 0, &box);
+                       flush = true;
                        /* Move the new buffer storage to the old pipe_resource. */
                        si_replace_buffer_storage(&rctx->b, &res->b.b, newb);
                        pipe_resource_reference(&newb, NULL);
@@ -772,6 +779,9 @@ static boolean r600_texture_get_handle(struct pipe_screen* screen,
                slice_size = 0;
        }
 
+       if (flush)
+               rctx->b.flush(&rctx->b, NULL, 0);
+
        if (res->b.is_shared) {
                /* USAGE_EXPLICIT_FLUSH must be cleared if at least one user
                 * doesn't set it.