diff options
| author | Mary Guillemard <mary.guillemard@collabora.com> | 2024-07-08 14:20:51 +0200 |
|---|---|---|
| committer | Marge Bot <emma+marge@anholt.net> | 2024-07-16 13:10:55 +0000 |
| commit | 668bde442197532c34894601fc753d2bdac86d67 (patch) | |
| tree | 05219b888d1c004b10fef687f14d717d7d935c45 /src/panfrost | |
| parent | ffef3d1709daa1ed81d98d8f12f3fcb74e9c4f95 (diff) | |
pan/kmod: Avoid deadlock on VA allocation failure on panthor
Fixes: 97f6a62f7ef ("pan/kmod: Add a backend for panthor")
Signed-off-by: Mary Guillemard <mary.guillemard@collabora.com>
Reviewed-by: Eric R. Smith <eric.smith@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/30150>
Diffstat (limited to 'src/panfrost')
| -rw-r--r-- | src/panfrost/lib/kmod/panthor_kmod.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/panfrost/lib/kmod/panthor_kmod.c b/src/panfrost/lib/kmod/panthor_kmod.c index 4404b6b1cad..22a08091336 100644 --- a/src/panfrost/lib/kmod/panthor_kmod.c +++ b/src/panfrost/lib/kmod/panthor_kmod.c @@ -977,12 +977,12 @@ panthor_kmod_vm_bind(struct pan_kmod_vm *vm, enum pan_kmod_vm_op_mode mode, simple_mtx_unlock(&panthor_vm->auto_va.lock); } +out_update_vas: if (track_activity) { panthor_kmod_vm_sync_unlock(vm, ret ? vm_orig_sync_point : vm_new_sync_point); } -out_update_vas: for (uint32_t i = 0; i < op_count; i++) { if (ops[i].type == PAN_KMOD_VM_OP_TYPE_MAP && ops[i].va.start == PAN_KMOD_VM_MAP_AUTO_VA) { |