diff options
| author |   Dmitry Osipenko <dmitry.osipenko@collabora.com> | 2022-06-30 23:07:21 +0300 |
|---|---|---|
| committer |   Gerd Hoffmann <kraxel@redhat.com> | 2022-07-19 14:40:58 +0200 |
| commit | 0f877398d30e1df657a31a62f7c7de1869b072b5 (patch) | |
| tree | 3318683847604b8f1d8c7ad04f4bc2e55c89c21c /drivers/gpu/drm/virtio/virtgpu_gem.c | |
| parent | drm/virtio: Unlock reservations on virtio_gpu_object_shmem_init() error (diff) | |
| download | linux-dev-0f877398d30e1df657a31a62f7c7de1869b072b5.tar.xz linux-dev-0f877398d30e1df657a31a62f7c7de1869b072b5.zip | |
drm/virtio: Unlock reservations on dma_resv_reserve_fences() error
Unlock reservations on dma_resv_reserve_fences() error to fix recursive
locking of the reservations when this error happens.
Cc: stable@vger.kernel.org
Fixes: c8d4c18bfbc4 ("dma-buf/drivers: make reserving a shared slot mandatory v4")
Reviewed-by: Thomas Hellström <thomas.hellstrom@linux.intel.com>
Signed-off-by: Dmitry Osipenko <dmitry.osipenko@collabora.com>
Link: http://patchwork.freedesktop.org/patch/msgid/20220630200726.1884320-5-dmitry.osipenko@collabora.com
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Diffstat (limited to '')
| -rw-r--r-- | drivers/gpu/drm/virtio/virtgpu_gem.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/gpu/drm/virtio/virtgpu_gem.c b/drivers/gpu/drm/virtio/virtgpu_gem.c index 580a78809836..7db48d17ee3a 100644 --- a/drivers/gpu/drm/virtio/virtgpu_gem.c +++ b/drivers/gpu/drm/virtio/virtgpu_gem.c @@ -228,8 +228,10 @@ int virtio_gpu_array_lock_resv(struct virtio_gpu_object_array *objs) for (i = 0; i < objs->nents; ++i) { ret = dma_resv_reserve_fences(objs->objs[i]->resv, 1); - if (ret) + if (ret) { + virtio_gpu_array_unlock_resv(objs); return ret; + } } return ret; } |