summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/armada
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@arm.linux.org.uk>2013-12-07 16:28:39 +0000
committerRussell King <rmk+kernel@arm.linux.org.uk>2013-12-10 20:25:18 +0000
commit5cd5268806435b6476184430b2806db988c903f0 (patch)
treee2df70520a79c5f23157a434f33121b58026fd4a /drivers/gpu/drm/armada
parent7513e09596374bb7fbbecfee945fecb5b357c0e9 (diff)
downloadblackbird-op-linux-5cd5268806435b6476184430b2806db988c903f0.tar.gz
blackbird-op-linux-5cd5268806435b6476184430b2806db988c903f0.zip
DRM: Armada: prime refcounting bug fix
Commit 011c2282c74d 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: Rob Clark <robdclark@gmail.com> Reviewed-by: Thierry Reding <treding@nvidia.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'drivers/gpu/drm/armada')
-rw-r--r--drivers/gpu/drm/armada/armada_gem.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/armada/armada_gem.c b/drivers/gpu/drm/armada/armada_gem.c
index adc7c2da75bb..887816f43476 100644
--- a/drivers/gpu/drm/armada/armada_gem.c
+++ b/drivers/gpu/drm/armada/armada_gem.c
@@ -558,7 +558,6 @@ armada_gem_prime_import(struct drm_device *dev, struct dma_buf *buf)
* refcount on the gem object itself.
*/
drm_gem_object_reference(obj);
- dma_buf_put(buf);
return obj;
}
}
@@ -574,6 +573,7 @@ armada_gem_prime_import(struct drm_device *dev, struct dma_buf *buf)
}
dobj->obj.import_attach = attach;
+ get_dma_buf(buf);
/*
* Don't call dma_buf_map_attachment() here - it maps the
OpenPOWER on IntegriCloud