radeonsi: remove r600_pipe_common::barrier_flags::compute_to_L2

Reviewed-by: Nicolai Hähnle <[email protected]>

3 files changed, 1 insertions, 8 deletions

diff --git a/src/gallium/drivers/radeon/r600_pipe_common.h b/src/gallium/drivers/radeon/r600_pipe_common.h
index 236b3bc0424..e9b6d46d02f 100644
--- 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 ded5211ca14..8e724f3c644 100644
--- 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 141662ac2cf..6c4e1832e42 100644
--- 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;