drm/armada: Prepare to dynamic dma-buf locking specification
authorDmitry Osipenko <dmitry.osipenko@collabora.com>
Mon, 17 Oct 2022 17:22:13 +0000 (20:22 +0300)
committerDmitry Osipenko <dmitry.osipenko@collabora.com>
Mon, 17 Oct 2022 22:21:41 +0000 (01:21 +0300)
Prepare Armada 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-6-dmitry.osipenko@collabora.com
drivers/gpu/drm/armada/armada_gem.c

index 5430265..26d1006 100644 (file)
@@ -66,8 +66,8 @@ void armada_gem_free_object(struct drm_gem_object *obj)
        if (dobj->obj.import_attach) {
                /* We only ever display imported data */
                if (dobj->sgt)
-                       dma_buf_unmap_attachment(dobj->obj.import_attach,
-                                                dobj->sgt, DMA_TO_DEVICE);
+                       dma_buf_unmap_attachment_unlocked(dobj->obj.import_attach,
+                                                         dobj->sgt, DMA_TO_DEVICE);
                drm_prime_gem_destroy(&dobj->obj, NULL);
        }
 
@@ -539,8 +539,8 @@ int armada_gem_map_import(struct armada_gem_object *dobj)
 {
        int ret;
 
-       dobj->sgt = dma_buf_map_attachment(dobj->obj.import_attach,
-                                          DMA_TO_DEVICE);
+       dobj->sgt = dma_buf_map_attachment_unlocked(dobj->obj.import_attach,
+                                                   DMA_TO_DEVICE);
        if (IS_ERR(dobj->sgt)) {
                ret = PTR_ERR(dobj->sgt);
                dobj->sgt = NULL;