Commit 5cd52688 authored by Russell King's avatar Russell King

DRM: Armada: prime refcounting bug fix

Commit 011c2282 changed the way refcounting on imported dma_bufs
works, and this hadn't been spotted while forward-porting Armada.
Reflect the changes in that commit into the Armada driver.
Reviewed-by: default avatarRob Clark <robdclark@gmail.com>
Reviewed-by: default avatarThierry Reding <treding@nvidia.com>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent 7513e095
...@@ -558,7 +558,6 @@ armada_gem_prime_import(struct drm_device *dev, struct dma_buf *buf) ...@@ -558,7 +558,6 @@ armada_gem_prime_import(struct drm_device *dev, struct dma_buf *buf)
* refcount on the gem object itself. * refcount on the gem object itself.
*/ */
drm_gem_object_reference(obj); drm_gem_object_reference(obj);
dma_buf_put(buf);
return obj; return obj;
} }
} }
...@@ -574,6 +573,7 @@ armada_gem_prime_import(struct drm_device *dev, struct dma_buf *buf) ...@@ -574,6 +573,7 @@ armada_gem_prime_import(struct drm_device *dev, struct dma_buf *buf)
} }
dobj->obj.import_attach = attach; dobj->obj.import_attach = attach;
get_dma_buf(buf);
/* /*
* Don't call dma_buf_map_attachment() here - it maps the * Don't call dma_buf_map_attachment() here - it maps the
......
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