AlexIndustrial/mesa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

freedreno: Split batch_flush_reset_dependencies()

Browse Source 
Flushing a batch needs to happen on driver thread, but the reset-but-
dont-actually-flush case does not.  Decouple these two different cases
to prepare for thread-safety annotations.

Signed-off-by: Rob Clark <robdclark@chromium.org>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/9061>
This commit is contained in:
Rob Clark
2021-02-15 12:50:26 -08:00
committed by Marge Bot
parent 8a54c4a335
commit e7e19c6a4f
1 changed files with 19 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/gallium/drivers/freedreno/freedreno_batch.c
+19 -7
View File
@@ -225,14 +225,26 @@ batch_fini(struct fd_batch *batch)
}
static void
batch_flush_reset_dependencies(struct fd_batch *batch, bool flush)
batch_flush_dependencies(struct fd_batch *batch)
{
struct fd_batch_cache *cache = &batch->ctx->screen->batch_cache;
struct fd_batch *dep;
foreach_batch(dep, cache, batch->dependents_mask) {
if (flush)
fd_batch_flush(dep);
foreach_batch (dep, cache, batch->dependents_mask) {
fd_batch_flush(dep);
fd_batch_reference(&dep, NULL);
}
batch->dependents_mask = 0;
}
static void
batch_reset_dependencies(struct fd_batch *batch)
{
struct fd_batch_cache *cache = &batch->ctx->screen->batch_cache;
struct fd_batch *dep;
foreach_batch (dep, cache, batch->dependents_mask) {
fd_batch_reference(&dep, NULL);
}
@@ -267,7 +279,7 @@ batch_reset(struct fd_batch *batch)
{
DBG("%p", batch);
batch_flush_reset_dependencies(batch, false);
batch_reset_dependencies(batch);
batch_reset_resources(batch);
batch_fini(batch);
@@ -301,7 +313,7 @@ __fd_batch_destroy(struct fd_batch *batch)
_mesa_set_destroy(batch->resources, NULL);
fd_screen_unlock(ctx->screen);
batch_flush_reset_dependencies(batch, false);
batch_reset_dependencies(batch);
debug_assert(batch->dependents_mask == 0);
util_copy_framebuffer_state(&batch->framebuffer, NULL);
@@ -344,7 +356,7 @@ batch_flush(struct fd_batch *batch)
*/
fd_batch_finish_queries(batch);
batch_flush_reset_dependencies(batch, true);
batch_flush_dependencies(batch);
batch->flushed = true;
if (batch == batch->ctx->batch)