Skip to content

Commit e4ea542

Browse files
committed
drm/armada: Prepare to dynamic dma-buf locking specification
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 <[email protected]> Signed-off-by: Dmitry Osipenko <[email protected]> Link: https://patchwork.freedesktop.org/patch/msgid/[email protected]
1 parent ac530e0 commit e4ea542

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

drivers/gpu/drm/armada/armada_gem.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -66,8 +66,8 @@ void armada_gem_free_object(struct drm_gem_object *obj)
6666
if (dobj->obj.import_attach) {
6767
/* We only ever display imported data */
6868
if (dobj->sgt)
69-
dma_buf_unmap_attachment(dobj->obj.import_attach,
70-
dobj->sgt, DMA_TO_DEVICE);
69+
dma_buf_unmap_attachment_unlocked(dobj->obj.import_attach,
70+
dobj->sgt, DMA_TO_DEVICE);
7171
drm_prime_gem_destroy(&dobj->obj, NULL);
7272
}
7373

@@ -539,8 +539,8 @@ int armada_gem_map_import(struct armada_gem_object *dobj)
539539
{
540540
int ret;
541541

542-
dobj->sgt = dma_buf_map_attachment(dobj->obj.import_attach,
543-
DMA_TO_DEVICE);
542+
dobj->sgt = dma_buf_map_attachment_unlocked(dobj->obj.import_attach,
543+
DMA_TO_DEVICE);
544544
if (IS_ERR(dobj->sgt)) {
545545
ret = PTR_ERR(dobj->sgt);
546546
dobj->sgt = NULL;

0 commit comments

Comments
 (0)