This is a note to let you know that I've just added the patch titled
drm/virtio: Unlock reservations on virtio_gpu_object_shmem_init() error
to the 5.15-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
drm-virtio-unlock-reservations-on-virtio_gpu_object_shmem_init-error.patch
and it can be found in the queue-5.15 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
>From fdf0ff4d12cbcd76b53f27c96ce51ddca400884a Mon Sep 17 00:00:00 2001
From: Dmitry Osipenko <dmitry.osipenko@xxxxxxxxxxxxx>
Date: Thu, 30 Jun 2022 23:07:20 +0300
Subject: drm/virtio: Unlock reservations on virtio_gpu_object_shmem_init() error
From: Dmitry Osipenko <dmitry.osipenko@xxxxxxxxxxxxx>
commit fdf0ff4d12cbcd76b53f27c96ce51ddca400884a upstream.
Unlock reservations in the error code path of virtio_gpu_object_create()
to silence debug warning splat produced by ww_mutex_destroy(&obj->lock)
when GEM is released with the held lock.
Cc: stable@xxxxxxxxxxxxxxx
Fixes: 30172efbfb84 ("drm/virtio: blob prep: refactor getting pages and attaching backing")
Reviewed-by: Emil Velikov <emil.l.velikov@xxxxxxxxx>
Signed-off-by: Dmitry Osipenko <dmitry.osipenko@xxxxxxxxxxxxx>
Link: http://patchwork.freedesktop.org/patch/msgid/20220630200726.1884320-4-dmitry.osipenko@xxxxxxxxxxxxx
Signed-off-by: Gerd Hoffmann <kraxel@xxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
drivers/gpu/drm/virtio/virtgpu_object.c | 2 ++
1 file changed, 2 insertions(+)
--- a/drivers/gpu/drm/virtio/virtgpu_object.c
+++ b/drivers/gpu/drm/virtio/virtgpu_object.c
@@ -247,6 +247,8 @@ int virtio_gpu_object_create(struct virt
ret = virtio_gpu_object_shmem_init(vgdev, bo, &ents, &nents);
if (ret != 0) {
+ if (fence)
+ virtio_gpu_array_unlock_resv(objs);
virtio_gpu_array_put_free(objs);
virtio_gpu_free_object(&shmem_obj->base);
return ret;
Patches currently in stable-queue which might be from dmitry.osipenko@xxxxxxxxxxxxx are
queue-5.15/drm-virtio-check-whether-transferred-2d-bo-is-shmem.patch
queue-5.15/drm-virtio-unlock-reservations-on-virtio_gpu_object_shmem_init-error.patch
queue-5.15/drm-virtio-use-appropriate-atomic-state-in-virtio_gpu_plane_cleanup_fb.patch
