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

    commit 0f877398d30e1df657a31a62f7c7de1869b072b5 upstream.

    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>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    ---
    drivers/gpu/drm/virtio/virtgpu_gem.c | 4 +++-
    1 file changed, 3 insertions(+), 1 deletion(-)

    --- 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 vi

    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;
    }

    \
     
     \ /
      Last update: 2022-10-19 10:51    [W:4.023 / U:0.972 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site