Module: Mesa Branch: staging/21.2 Commit: 57163a984782b49866cbc62bb077d1a165af5f1e URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=57163a984782b49866cbc62bb077d1a165af5f1e
Author: Alyssa Rosenzweig <[email protected]> Date: Tue Aug 17 16:46:46 2021 +0000 panfrost: Remove rsrc->track.users No longer needed. Signed-off-by: Alyssa Rosenzweig <[email protected]> Cc: mesa-stable Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/12528> (cherry picked from commit e7eb28fed0a2f13ef1ca05876c90b3fc9f7243ed) --- .pick_status.json | 2 +- src/gallium/drivers/panfrost/pan_job.c | 4 ---- src/gallium/drivers/panfrost/pan_resource.h | 1 - 3 files changed, 1 insertion(+), 6 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index d5f5c3228b7..f90123d473e 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -1147,7 +1147,7 @@ "description": "panfrost: Remove rsrc->track.users", "nominated": true, "nomination_type": 0, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": null }, diff --git a/src/gallium/drivers/panfrost/pan_job.c b/src/gallium/drivers/panfrost/pan_job.c index e8fa8de4e2a..32376dbea0e 100644 --- a/src/gallium/drivers/panfrost/pan_job.c +++ b/src/gallium/drivers/panfrost/pan_job.c @@ -131,7 +131,6 @@ panfrost_batch_cleanup(struct panfrost_batch *batch) set_foreach_remove(batch->resources, entry) { struct panfrost_resource *rsrc = (void *) entry->key; - BITSET_CLEAR(rsrc->track.users, batch_idx); if (rsrc->track.writer == batch) rsrc->track.writer = NULL; @@ -279,8 +278,6 @@ panfrost_batch_update_access(struct panfrost_batch *batch, _mesa_set_search_or_add(batch->resources, rsrc, &found); if (!found) { - BITSET_SET(rsrc->track.users, batch_idx); - /* Cache number of batches accessing a resource */ rsrc->track.nr_users++; @@ -956,7 +953,6 @@ panfrost_flush_batches_accessing_rsrc(struct panfrost_context *ctx, panfrost_batch_submit(batch, ctx->syncobj, ctx->syncobj); } - assert(!BITSET_COUNT(rsrc->track.users)); rsrc->track.writer = NULL; } diff --git a/src/gallium/drivers/panfrost/pan_resource.h b/src/gallium/drivers/panfrost/pan_resource.h index ec4f0005c4e..de0597a48f0 100644 --- a/src/gallium/drivers/panfrost/pan_resource.h +++ b/src/gallium/drivers/panfrost/pan_resource.h @@ -49,7 +49,6 @@ struct panfrost_resource { struct { struct panfrost_batch *writer; - BITSET_DECLARE(users, PAN_MAX_BATCHES); /** Number of batches accessing this resource. Used to check if * a resource is in use. */
