mirror of
https://gitlab.freedesktop.org/mesa/mesa.git
synced 2026-05-06 13:48:06 +02:00
tu/drm/virtio: Avoid freeing zombified tu_sparse_vma
This isd3cedd2fa5("tu/drm: msm's has_set_iova codepath should avoid freeing zombified tu_sparse_vma") but for virtio. Fixes:764b3d9161("tu: Implement transient attachments and lazily allocated memory") Signed-off-by: Valentine Burley <valentine.burley@collabora.com> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/40507>
This commit is contained in:
parent
7a96bc3187
commit
f1366ca144
1 changed files with 10 additions and 3 deletions
|
|
@ -753,6 +753,8 @@ virtio_bo_init(struct tu_device *dev,
|
|||
}
|
||||
|
||||
*out_bo = bo;
|
||||
if (lazy_vma)
|
||||
lazy_vma->msm.backs_lazy_bo = true;
|
||||
|
||||
/* We don't use bo->name here because for the !TU_DEBUG=bo case bo->name is NULL. */
|
||||
tu_bo_set_kernel_name(dev, bo, name);
|
||||
|
|
@ -949,9 +951,14 @@ static void
|
|||
virtio_sparse_vma_finish(struct tu_device *dev,
|
||||
struct tu_sparse_vma *vma)
|
||||
{
|
||||
mtx_lock(&dev->vma_mutex);
|
||||
util_vma_heap_free(&dev->vma, vma->msm.iova, vma->msm.size);
|
||||
mtx_unlock(&dev->vma_mutex);
|
||||
/* For has_set_iova, if a lazy BO was mapped into this sparse VMA
|
||||
* the allocation will be handed off to the zombie VMA mechanism.
|
||||
*/
|
||||
if (!vma->msm.backs_lazy_bo) {
|
||||
mtx_lock(&dev->vma_mutex);
|
||||
util_vma_heap_free(&dev->vma, vma->msm.iova, vma->msm.size);
|
||||
mtx_unlock(&dev->vma_mutex);
|
||||
}
|
||||
}
|
||||
|
||||
static VkResult
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue