panfrost: Fix calls to panfrost_flush_batches_accessing_bo
authorIcecream95 <ixn@keemail.me>
Fri, 17 Jul 2020 23:39:45 +0000 (11:39 +1200)
committerMarge Bot <eric+marge@anholt.net>
Sat, 18 Jul 2020 01:36:59 +0000 (01:36 +0000)
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@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/5962>

src/gallium/drivers/panfrost/pan_context.c
src/gallium/drivers/panfrost/pan_resource.c

index ca383a8a8bedb8026e82664adc94e4e2c3547ca5..d2b44f907de41a3a59b0742d8e759f490768edf1 100644 (file)
@@ -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 */
index 70a6d3d9b6690ebfb0096ba5771804d4a116bd1c..3cd9b65bcae8e99786e91c9220810a63583f29f1 100644 (file)
@@ -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;