]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
drm/omapdrm: Prepare to dynamic dma-buf locking specification
authorDmitry Osipenko <dmitry.osipenko@collabora.com>
Mon, 17 Oct 2022 17:22:15 +0000 (20:22 +0300)
committerDmitry Osipenko <dmitry.osipenko@collabora.com>
Mon, 17 Oct 2022 22:21:43 +0000 (01:21 +0300)
Prepare OMAP DRM driver to the common dynamic dma-buf locking convention
by starting to use the unlocked versions of dma-buf API functions.

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-8-dmitry.osipenko@collabora.com
drivers/gpu/drm/omapdrm/omap_gem_dmabuf.c

index 393f82e26927031fb622821d8671f0e2e4f1dfc4..8e194dbc95066eb214563cb39e1922e48244ef80 100644 (file)
@@ -125,7 +125,7 @@ struct drm_gem_object *omap_gem_prime_import(struct drm_device *dev,
 
        get_dma_buf(dma_buf);
 
-       sgt = dma_buf_map_attachment(attach, DMA_TO_DEVICE);
+       sgt = dma_buf_map_attachment_unlocked(attach, DMA_TO_DEVICE);
        if (IS_ERR(sgt)) {
                ret = PTR_ERR(sgt);
                goto fail_detach;
@@ -142,7 +142,7 @@ struct drm_gem_object *omap_gem_prime_import(struct drm_device *dev,
        return obj;
 
 fail_unmap:
-       dma_buf_unmap_attachment(attach, sgt, DMA_TO_DEVICE);
+       dma_buf_unmap_attachment_unlocked(attach, sgt, DMA_TO_DEVICE);
 fail_detach:
        dma_buf_detach(dma_buf, attach);
        dma_buf_put(dma_buf);