diff options
author | YoungJun Cho <yj44.cho@samsung.com> | 2013-06-25 21:21:40 -0400 |
---|---|---|
committer | Dave Airlie <airlied@redhat.com> | 2013-06-27 22:49:07 -0400 |
commit | 7d8f06ac901300e0b517a263f571531ca27e47b6 (patch) | |
tree | f1964a8607f87392a461b71e66aa6f7bb5a3ac3f /drivers/gpu | |
parent | 538d6661f5d8ad9dcf4ab66c9a99407464111e7a (diff) |
drm/prime: fix to put an exported dma_buf for adding handle failure
When drm_prime_add_buf_handle() returns failure for an exported
dma_buf, the dma_buf was already allocated and its refcount was
increased, so it needs to be put.
Signed-off-by: YoungJun Cho <yj44.cho@samsung.com>
Signed-off-by: Seung-Woo Kim <sw0312.kim@samsung.com>
Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'drivers/gpu')
-rw-r--r-- | drivers/gpu/drm/drm_prime.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/drivers/gpu/drm/drm_prime.c b/drivers/gpu/drm/drm_prime.c index b1cd47438850..340caabc0424 100644 --- a/drivers/gpu/drm/drm_prime.c +++ b/drivers/gpu/drm/drm_prime.c | |||
@@ -306,7 +306,7 @@ int drm_gem_prime_handle_to_fd(struct drm_device *dev, | |||
306 | ret = drm_prime_add_buf_handle(&file_priv->prime, | 306 | ret = drm_prime_add_buf_handle(&file_priv->prime, |
307 | obj->export_dma_buf, handle); | 307 | obj->export_dma_buf, handle); |
308 | if (ret) | 308 | if (ret) |
309 | goto out; | 309 | goto fail_put_dmabuf; |
310 | 310 | ||
311 | *prime_fd = dma_buf_fd(buf, flags); | 311 | *prime_fd = dma_buf_fd(buf, flags); |
312 | mutex_unlock(&file_priv->prime.lock); | 312 | mutex_unlock(&file_priv->prime.lock); |
@@ -315,6 +315,12 @@ int drm_gem_prime_handle_to_fd(struct drm_device *dev, | |||
315 | out_have_obj: | 315 | out_have_obj: |
316 | get_dma_buf(dmabuf); | 316 | get_dma_buf(dmabuf); |
317 | *prime_fd = dma_buf_fd(dmabuf, flags); | 317 | *prime_fd = dma_buf_fd(dmabuf, flags); |
318 | goto out; | ||
319 | |||
320 | fail_put_dmabuf: | ||
321 | /* clear NOT to be checked when releasing dma_buf */ | ||
322 | obj->export_dma_buf = NULL; | ||
323 | dma_buf_put(buf); | ||
318 | out: | 324 | out: |
319 | drm_gem_object_unreference_unlocked(obj); | 325 | drm_gem_object_unreference_unlocked(obj); |
320 | mutex_unlock(&file_priv->prime.lock); | 326 | mutex_unlock(&file_priv->prime.lock); |