diff options
| author | Dmitry Osipenko <dmitry.osipenko@collabora.com> | 2022-10-17 19:22:21 +0200 |
|---|---|---|
| committer | Dmitry Osipenko <dmitry.osipenko@collabora.com> | 2022-10-18 00:21:48 +0200 |
| commit | a26ee3b71896d4e0d52d866fd16cc42da7106e6f (patch) | |
| tree | 208b5b200fc4c425f55b7111446f9cd5a9bdcaea /drivers/media/common/videobuf2/videobuf2-vmalloc.c | |
| parent | xen/gntdev: Prepare to dynamic dma-buf locking specification (diff) | |
| download | linux-a26ee3b71896d4e0d52d866fd16cc42da7106e6f.tar.xz linux-a26ee3b71896d4e0d52d866fd16cc42da7106e6f.zip | |
media: videobuf2: Prepare to dynamic dma-buf locking specification
Prepare V4L2 memory allocators to the common dynamic dma-buf locking
convention by starting to use the unlocked versions of dma-buf API
functions.
Acked-by: Tomasz Figa <tfiga@chromium.org>
Acked-by: Christian König <christian.koenig@amd.com>
Signed-off-by: Dmitry Osipenko <dmitry.osipenko@collabora.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20221017172229.42269-14-dmitry.osipenko@collabora.com
Diffstat (limited to 'drivers/media/common/videobuf2/videobuf2-vmalloc.c')
| -rw-r--r-- | drivers/media/common/videobuf2/videobuf2-vmalloc.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/media/common/videobuf2/videobuf2-vmalloc.c b/drivers/media/common/videobuf2/videobuf2-vmalloc.c index 948152f1596b..7831bf545874 100644 --- a/drivers/media/common/videobuf2/videobuf2-vmalloc.c +++ b/drivers/media/common/videobuf2/videobuf2-vmalloc.c @@ -376,7 +376,7 @@ static int vb2_vmalloc_map_dmabuf(void *mem_priv) struct iosys_map map; int ret; - ret = dma_buf_vmap(buf->dbuf, &map); + ret = dma_buf_vmap_unlocked(buf->dbuf, &map); if (ret) return -EFAULT; buf->vaddr = map.vaddr; @@ -389,7 +389,7 @@ static void vb2_vmalloc_unmap_dmabuf(void *mem_priv) struct vb2_vmalloc_buf *buf = mem_priv; struct iosys_map map = IOSYS_MAP_INIT_VADDR(buf->vaddr); - dma_buf_vunmap(buf->dbuf, &map); + dma_buf_vunmap_unlocked(buf->dbuf, &map); buf->vaddr = NULL; } @@ -399,7 +399,7 @@ static void vb2_vmalloc_detach_dmabuf(void *mem_priv) struct iosys_map map = IOSYS_MAP_INIT_VADDR(buf->vaddr); if (buf->vaddr) - dma_buf_vunmap(buf->dbuf, &map); + dma_buf_vunmap_unlocked(buf->dbuf, &map); kfree(buf); } |