lkml.org 
[lkml]   [2022]   [Oct]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.15 053/530] drm/virtio: Unlock reservations on virtio_gpu_object_shmem_init() error
    Date
    From: Dmitry Osipenko <dmitry.osipenko@collabora.com>

    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@vger.kernel.org
    Fixes: 30172efbfb84 ("drm/virtio: blob prep: refactor getting pages and attaching backing")
    Reviewed-by: Emil Velikov <emil.l.velikov@gmail.com>
    Signed-off-by: Dmitry Osipenko <dmitry.osipenko@collabora.com>
    Link: http://patchwork.freedesktop.org/patch/msgid/20220630200726.1884320-4-dmitry.osipenko@collabora.com
    Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    ---
    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;

    \
     
     \ /
      Last update: 2022-10-24 22:01    [W:2.366 / U:0.628 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site