Commit e4ea5428 authored by Dmitry Osipenko's avatar Dmitry Osipenko
Browse files

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

drivers/gpu/drm/armada/armada_gem.c

+4 −4
Original line number Diff line number Diff line
@@ -66,7 +66,7 @@ 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,

			dma_buf_unmap_attachment_unlocked(dobj->obj.import_attach,

							  dobj->sgt, DMA_TO_DEVICE);

		drm_prime_gem_destroy(&dobj->obj, NULL);

	}
@@ -539,7 +539,7 @@ int armada_gem_map_import(struct armada_gem_object *dobj) 
{

	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);

	if (IS_ERR(dobj->sgt)) {

		ret = PTR_ERR(dobj->sgt);