Mesa (master): panfrost: Fix calls to panfrost_flush_batches_accessing_bo
GitLab Mirror
gitlab-mirror at kemper.freedesktop.org
Sat Jul 18 01:56:45 UTC 2020
Module: Mesa
Branch: master
Commit: 0ef168d513059b276fb9b70ab95af874983ab08b
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=0ef168d513059b276fb9b70ab95af874983ab08b
Author: Icecream95 <ixn at keemail.me>
Date: Sat Jul 18 11:39:45 2020 +1200
panfrost: Fix calls to panfrost_flush_batches_accessing_bo
The function now takes a bool flush_readers instead of an access type,
but some calls were not updated.
Reviewed-by: Alyssa Rosenzweig <alyssa.rosenzweig at collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/5962>
---
src/gallium/drivers/panfrost/pan_context.c | 2 +-
src/gallium/drivers/panfrost/pan_resource.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/gallium/drivers/panfrost/pan_context.c b/src/gallium/drivers/panfrost/pan_context.c
index ca383a8a8be..d2b44f907de 100644
--- a/src/gallium/drivers/panfrost/pan_context.c
+++ b/src/gallium/drivers/panfrost/pan_context.c
@@ -1390,7 +1390,7 @@ panfrost_get_query_result(struct pipe_context *pipe,
case PIPE_QUERY_OCCLUSION_COUNTER:
case PIPE_QUERY_OCCLUSION_PREDICATE:
case PIPE_QUERY_OCCLUSION_PREDICATE_CONSERVATIVE:
- panfrost_flush_batches_accessing_bo(ctx, query->bo, PAN_BO_ACCESS_WRITE);
+ panfrost_flush_batches_accessing_bo(ctx, query->bo, false);
panfrost_bo_wait(query->bo, INT64_MAX, false);
/* Read back the query results */
diff --git a/src/gallium/drivers/panfrost/pan_resource.c b/src/gallium/drivers/panfrost/pan_resource.c
index 70a6d3d9b66..3cd9b65bcae 100644
--- a/src/gallium/drivers/panfrost/pan_resource.c
+++ b/src/gallium/drivers/panfrost/pan_resource.c
@@ -578,7 +578,7 @@ panfrost_transfer_map(struct pipe_context *pctx,
* mitigates broken depth reload.
*/
- panfrost_flush_batches_accessing_bo(ctx, bo, PAN_BO_ACCESS_WRITE);
+ panfrost_flush_batches_accessing_bo(ctx, bo, false);
panfrost_bo_wait(bo, INT64_MAX, false);
create_new_bo = true;
More information about the mesa-commit
mailing list