radeonsi: remove r600_pipe_common::barrier_flags::compute_to_L2

Reviewed-by: Nicolai Hähnle <nicolai.haehnle@amd.com>

diff --git a/src/gallium/drivers/radeon/r600_pipe_common.h b/src/gallium/drivers/radeon/r600_pipe_common.h
index 236b3bc04242fceb3457c6cba062487d4d02761b..e9b6d46d02f01c5bc39b652a769c8951c4c5d4ef 100644 (file)
--- a/src/gallium/drivers/radeon/r600_pipe_common.h
+++ b/src/gallium/drivers/radeon/r600_pipe_common.h
@@ -428,11 +428,6 @@ struct r600_common_screen {
                 * that end in L2 are seen by CP.
                 */
                unsigned L2_to_cp;
-
-               /* Context flags to set so that all writes from earlier
-                * compute jobs are seen by L2 clients.
-                */
-               unsigned compute_to_L2;
        } barrier_flags;
 };
 

diff --git a/src/gallium/drivers/radeon/r600_query.c b/src/gallium/drivers/radeon/r600_query.c
index ded5211ca144519c87d8164aac2ad3281b3ed601..8e724f3c6444cf36aa5d7ca1ef9afed463978093 100644 (file)
--- a/src/gallium/drivers/radeon/r600_query.c
+++ b/src/gallium/drivers/radeon/r600_query.c
@@ -1768,7 +1768,7 @@ static void r600_query_hw_get_result_resource(struct r600_common_context *rctx,
                }
 
                rctx->b.launch_grid(&rctx->b, &grid);
-               rctx->flags |= rctx->screen->barrier_flags.compute_to_L2;
+               rctx->flags |= SI_CONTEXT_CS_PARTIAL_FLUSH;
        }
 
        r600_restore_qbo_state(rctx, &saved_state);

diff --git a/src/gallium/drivers/radeonsi/si_pipe.c b/src/gallium/drivers/radeonsi/si_pipe.c
index 141662ac2cf0c34bb08698ff99e51c32f08c70ff..6c4e1832e42503c1a8d0d1f7eaa9ceb4b529b771 100644 (file)
--- a/src/gallium/drivers/radeonsi/si_pipe.c
+++ b/src/gallium/drivers/radeonsi/si_pipe.c
@@ -842,8 +842,6 @@ struct pipe_screen *radeonsi_screen_create(struct radeon_winsys *ws,
                sscreen->b.barrier_flags.L2_to_cp |= SI_CONTEXT_WRITEBACK_GLOBAL_L2;
        }
 
-       sscreen->b.barrier_flags.compute_to_L2 = SI_CONTEXT_CS_PARTIAL_FLUSH;
-
        if (debug_get_bool_option("RADEON_DUMP_SHADERS", false))
                sscreen->b.debug_flags |= DBG_ALL_SHADERS;