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

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
...@@ -69,8 +69,9 @@ void armada_gem_free_object(struct drm_gem_object *obj) ...@@ -69,8 +69,9 @@ 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 */
dma_buf_unmap_attachment(dobj->obj.import_attach, dobj->sgt, if (dobj->sgt)
DMA_TO_DEVICE); dma_buf_unmap_attachment(dobj->obj.import_attach,
dobj->sgt, DMA_TO_DEVICE);
drm_prime_gem_destroy(&dobj->obj, NULL); drm_prime_gem_destroy(&dobj->obj, 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