zink: remove implicit query resets

this existed in order to reset query pools in advance so they
would never overflow. now the pools are reset every time the query
is started, so this behavior is no longer necessary

fixes #6475

Fixes: 57dd05616f ("zink/query: rewrite the query handling code to pass validation.")

Reviewed-by: Dave Airlie <airlied@redhat.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/16484>
(cherry picked from commit 1c62c6bafd)
This commit is contained in:
Mike Blumenkrantz 2022-05-12 17:14:57 -04:00 committed by Dylan Baker
parent a21fe41535
commit aa9b7d349c
2 changed files with 1 additions and 10 deletions

View file

@ -373,7 +373,7 @@
"description": "zink: remove implicit query resets",
"nominated": true,
"nomination_type": 1,
"resolution": 0,
"resolution": 1,
"main_sha": null,
"because_sha": "57dd05616fad8ba39c15ec4816682016a15bed1c"
},

View file

@ -1000,15 +1000,6 @@ suspend_query(struct zink_context *ctx, struct zink_query *query)
end_query(ctx, &ctx->batch, query);
if (query->needs_update)
update_qbo(ctx, query);
/* do an implicit copy+reset if:
* - query is being read from and >50% of pool is used
* - >90% of pool is used
*
* this avoids overflow
*/
struct zink_query_start *start = util_dynarray_top_ptr(&query->starts, struct zink_query_start);
if (get_num_starts(query) == 100 || (get_num_starts(query) && start->vkq[0]->query_id > NUM_QUERIES / 2) || (start->vkq[0]->query_id > NUM_QUERIES * 0.9))
reset_qbos(ctx, query);
}
void