iris: Destroy transfer slab after batches
Batches are going to have an uploader in the next commit, so destroying batches will destroy uploaders, which will unmap transfers, which will return things to the slab allocator. So we need to reorder destroying the slab allocator to the end to avoid crashing. Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/3802>
This commit is contained in:
committed by
Marge Bot
parent
c94379c770
commit
fb95ac6855
@@ -202,12 +202,12 @@ iris_destroy_context(struct pipe_context *ctx)
|
||||
u_upload_destroy(ice->state.dynamic_uploader);
|
||||
u_upload_destroy(ice->query_buffer_uploader);
|
||||
|
||||
slab_destroy_child(&ice->transfer_pool);
|
||||
|
||||
iris_batch_free(&ice->batches[IRIS_BATCH_RENDER]);
|
||||
iris_batch_free(&ice->batches[IRIS_BATCH_COMPUTE]);
|
||||
iris_destroy_binder(&ice->state.binder);
|
||||
|
||||
slab_destroy_child(&ice->transfer_pool);
|
||||
|
||||
ralloc_free(ice);
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user