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

zink: make batch_usage_unset take a batch state param

Browse Source 
no functional changes

Reviewed-by: Dave Airlie <airlied@redhat.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/11399>
This commit is contained in:
Mike Blumenkrantz
2021-05-07 08:21:02 -04:00
committed by Marge Bot
parent 50cfe0dbd1
commit 48add48209
4 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/gallium/drivers/zink/zink_batch.c
+2 -2
View File
@@ -42,12 +42,12 @@ zink_reset_batch_state(struct zink_context *ctx, struct zink_batch_state *bs)
set_foreach_remove(bs->surfaces, entry) {
struct zink_surface *surf = (struct zink_surface *)entry->key;
zink_batch_usage_unset(&surf->batch_uses, bs->fence.batch_id);
zink_batch_usage_unset(&surf->batch_uses, bs);
zink_surface_reference(screen, &surf, NULL);
}
set_foreach_remove(bs->bufferviews, entry) {
struct zink_buffer_view *buffer_view = (struct zink_buffer_view *)entry->key;
zink_batch_usage_unset(&buffer_view->batch_uses, bs->fence.batch_id);
zink_batch_usage_unset(&buffer_view->batch_uses, bs);
zink_buffer_view_reference(screen, &buffer_view, NULL);
}
src/gallium/drivers/zink/zink_batch.h
+2 -2
View File
@@ -175,9 +175,9 @@ zink_batch_state_reference(struct zink_screen *screen,
}
static inline void
zink_batch_usage_unset(struct zink_batch_usage *u, uint32_t batch_id)
zink_batch_usage_unset(struct zink_batch_usage *u, struct zink_batch_state *bs)
{
p_atomic_cmpxchg(&u->usage, batch_id, 0);
p_atomic_cmpxchg(&u->usage, bs->fence.batch_id, 0);
}
static inline void
src/gallium/drivers/zink/zink_descriptors.c
+1 -1
View File
@@ -1387,7 +1387,7 @@ zink_batch_descriptor_reset(struct zink_screen *screen, struct zink_batch_state
{
set_foreach(bs->dd->desc_sets, entry) {
struct zink_descriptor_set *zds = (void*)entry->key;
zink_batch_usage_unset(&zds->batch_uses, bs->fence.batch_id);
zink_batch_usage_unset(&zds->batch_uses, bs);
/* reset descriptor pools when no bs is using this program to avoid
* having some inactive program hogging a billion descriptors
*/
src/gallium/drivers/zink/zink_fence.c
+2 -2
View File
@@ -39,8 +39,8 @@ zink_fence_clear_resources(struct zink_screen *screen, struct zink_fence *fence)
/* unref all used resources */
set_foreach_remove(fence->resources, entry) {
struct zink_resource_object *obj = (struct zink_resource_object *)entry->key;
zink_batch_usage_unset(&obj->reads, fence->batch_id);
zink_batch_usage_unset(&obj->writes, fence->batch_id);
zink_batch_usage_unset(&obj->reads, zink_batch_state(fence));
zink_batch_usage_unset(&obj->writes, zink_batch_state(fence));
zink_resource_object_reference(screen, &obj, NULL);
}
simple_mtx_unlock(&fence->resource_mtx);