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

zink: fix submit_count disambiguation for bo usage checks

Browse Source 
also improve docs for submit_count to avoid similar errors

Fixes: 61b0955308 ("zink: always check submit_count to disambiguate when checking/waiting")
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/35940>
This commit is contained in:
Mike Blumenkrantz
2025-07-04 10:43:43 -04:00
committed by Marge Bot
parent 69b5abee14
commit 3925e53efe
2 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/gallium/drivers/zink/zink_bo.h
+7 -4
View File
@@ -145,6 +145,7 @@ zink_bo_commit(struct zink_context *ctx, struct zink_resource *res, unsigned lev
static ALWAYS_INLINE bool
zink_bo_has_unflushed_usage(const struct zink_bo *bo)
{
/* submit_count always matches for unflushed usage */
return (bo->reads.u && bo->reads.submit_count == bo->reads.u->submit_count && zink_batch_usage_is_unflushed(bo->reads.u)) ||
(bo->writes.u && bo->writes.submit_count == bo->writes.u->submit_count && zink_batch_usage_is_unflushed(bo->writes.u));
}
@@ -153,15 +154,17 @@ static ALWAYS_INLINE bool
zink_bo_has_usage(const struct zink_bo *bo)
{
return zink_bo_has_unflushed_usage(bo) ||
(zink_batch_usage_exists(bo->reads.u) && bo->reads.submit_count == bo->reads.u->submit_count) ||
(zink_batch_usage_exists(bo->writes.u) && bo->writes.submit_count == bo->writes.u->submit_count);
/* submit_count increments on batch submit and reset, so diff<=1 means same batch submission */
(zink_batch_usage_exists(bo->reads.u) && bo->reads.u->submit_count - bo->reads.submit_count <= 1) ||
(zink_batch_usage_exists(bo->writes.u) && bo->writes.u->submit_count - bo->writes.submit_count <= 1);
}
static ALWAYS_INLINE bool
zink_bo_usage_matches(const struct zink_bo *bo, const struct zink_batch_state *bs)
{
return (zink_batch_usage_matches(bo->reads.u, bs) && bo->reads.submit_count == bo->reads.u->submit_count) ||
(zink_batch_usage_matches(bo->writes.u, bs) && bo->writes.submit_count == bo->writes.u->submit_count);
/* submit_count increments on batch submit and reset, so diff<=1 means same batch submission */
return (zink_batch_usage_matches(bo->reads.u, bs) && bo->reads.u->submit_count - bo->reads.submit_count <= 1) ||
(zink_batch_usage_matches(bo->writes.u, bs) && bo->writes.u->submit_count - bo->writes.submit_count <= 1);
}
static ALWAYS_INLINE bool
src/gallium/drivers/zink/zink_types.h
+5 -1
View File
@@ -566,7 +566,11 @@ struct zink_batch_descriptor_data {
*/
struct zink_batch_usage {
uint32_t usage;
/* this is a monotonic int used to disambiguate internal fences from their tc fence references */
/* this is a monotonic int used to disambiguate internal fences from their tc fence references AND
* to disambiguate zink_bo usage when batches are reused
*
* it increments on batch submit and batch reset, meaning that a diff<=1 means matching usage
*/
uint32_t submit_count;
cnd_t flush;
mtx_t mtx;