Commit e4ea5428 authored by Dmitry Osipenko's avatar Dmitry Osipenko

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: default avatarChristian König <christian.koenig@amd.com>
Signed-off-by: default avatarDmitry Osipenko <dmitry.osipenko@collabora.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20221017172229.42269-6-dmitry.osipenko@collabora.com
parent ac530e0b
...@@ -66,8 +66,8 @@ void armada_gem_free_object(struct drm_gem_object *obj) ...@@ -66,8 +66,8 @@ void armada_gem_free_object(struct drm_gem_object *obj)
if (dobj->obj.import_attach) { if (dobj->obj.import_attach) {
/* We only ever display imported data */ /* We only ever display imported data */
if (dobj->sgt) if (dobj->sgt)
dma_buf_unmap_attachment(dobj->obj.import_attach, dma_buf_unmap_attachment_unlocked(dobj->obj.import_attach,
dobj->sgt, DMA_TO_DEVICE); dobj->sgt, DMA_TO_DEVICE);
drm_prime_gem_destroy(&dobj->obj, NULL); drm_prime_gem_destroy(&dobj->obj, NULL);
} }
...@@ -539,8 +539,8 @@ int armada_gem_map_import(struct armada_gem_object *dobj) ...@@ -539,8 +539,8 @@ int armada_gem_map_import(struct armada_gem_object *dobj)
{ {
int ret; int ret;
dobj->sgt = dma_buf_map_attachment(dobj->obj.import_attach, dobj->sgt = dma_buf_map_attachment_unlocked(dobj->obj.import_attach,
DMA_TO_DEVICE); DMA_TO_DEVICE);
if (IS_ERR(dobj->sgt)) { if (IS_ERR(dobj->sgt)) {
ret = PTR_ERR(dobj->sgt); ret = PTR_ERR(dobj->sgt);
dobj->sgt = NULL; dobj->sgt = NULL;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment