diff options
| author | YoungJun Cho <yj44.cho@samsung.com> | 2013-06-24 15:34:21 +0900 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2013-06-28 12:45:11 +1000 |
| commit | b720d54a5caf077011f0dc6ba7792866d2828d16 (patch) | |
| tree | 9ffabea64b3267066097b5713611c96b074704c7 /drivers/gpu/drm/drm_prime.c | |
| parent | 2e07fb229396f99fc173d8612f0f83ea9de0341b (diff) | |
| download | op-kernel-dev-b720d54a5caf077011f0dc6ba7792866d2828d16.zip op-kernel-dev-b720d54a5caf077011f0dc6ba7792866d2828d16.tar.gz | |
drm/prime: fix to check return of dma_map_sg in prime helper
The dma_map_sg(), in map_dma_buf callback operation of prime helper,
can return 0 when it fails to map, so it needs to release related
resources.
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/drm/drm_prime.c')
| -rw-r--r-- | drivers/gpu/drm/drm_prime.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/drivers/gpu/drm/drm_prime.c b/drivers/gpu/drm/drm_prime.c index e57c675..0daf212 100644 --- a/drivers/gpu/drm/drm_prime.c +++ b/drivers/gpu/drm/drm_prime.c @@ -97,8 +97,13 @@ static struct sg_table *drm_gem_map_dma_buf(struct dma_buf_attachment *attach, sgt = obj->dev->driver->gem_prime_get_sg_table(obj); - if (!IS_ERR_OR_NULL(sgt)) - dma_map_sg(attach->dev, sgt->sgl, sgt->nents, dir); + if (!IS_ERR_OR_NULL(sgt)) { + if (!dma_map_sg(attach->dev, sgt->sgl, sgt->nents, dir)) { + sg_free_table(sgt); + kfree(sgt); + sgt = ERR_PTR(-ENOMEM); + } + } mutex_unlock(&obj->dev->struct_mutex); return sgt; |
