Commit 0481c8c4 authored by Russell King's avatar Russell King
Browse files

drm/armada: fix gem object free after failed prime import 



Fix the gem object freeing after a partial import of a dma buffer,
eg, one which has been imported, but not mapped.  This was provoking
a warning from the dma_buf code.

Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent 41dbb2db

drivers/gpu/drm/armada/armada_gem.c

+3 −2
Original line number Diff line number Diff line
@@ -69,8 +69,9 @@ void armada_gem_free_object(struct drm_gem_object *obj) 


	if (dobj->obj.import_attach) {

		/* We only ever display imported data */

		dma_buf_unmap_attachment(dobj->obj.import_attach, dobj->sgt,

					 DMA_TO_DEVICE);

		if (dobj->sgt)

			dma_buf_unmap_attachment(dobj->obj.import_attach,

						 dobj->sgt, DMA_TO_DEVICE);

		drm_prime_gem_destroy(&dobj->obj, NULL);

	}

CRA Git | Maintained and supported by SUSTech CRA and CCSE