diff options
author | YoungJun Cho <yj44.cho@samsung.com> | 2013-06-26 19:39:58 -0400 |
---|---|---|
committer | Dave Airlie <airlied@redhat.com> | 2013-06-27 22:30:15 -0400 |
commit | 4368dd846d067ed7d11281050e7676ae614d6053 (patch) | |
tree | e97b6d50520fa74b0281000425fe54ed37c52665 /drivers/gpu/drm/omapdrm | |
parent | 2644ee9614be67abe155f1073bb9e1b737bbca53 (diff) |
drm/gem: add mutex lock when using drm_gem_mmap_obj
The drm_gem_mmap_obj() has to be protected with dev->struct_mutex,
but some caller functions do not. So it adds mutex lock to missing
callers and adds assertion to check whether drm_gem_mmap_obj() is
called with mutex lock or not.
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>
Reviewed-by: Maarten Lankhorst <maarten.lankhorst@canonical.com>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: Rob Clark <robdclark@gmail.com>
Reviewed-by: Maarten Lankhorst <maarten.lankhorst@canonical.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/omapdrm')
-rw-r--r-- | drivers/gpu/drm/omapdrm/omap_gem_dmabuf.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/gpu/drm/omapdrm/omap_gem_dmabuf.c b/drivers/gpu/drm/omapdrm/omap_gem_dmabuf.c index 3256693de110..4fcca8d42796 100644 --- a/drivers/gpu/drm/omapdrm/omap_gem_dmabuf.c +++ b/drivers/gpu/drm/omapdrm/omap_gem_dmabuf.c | |||
@@ -140,12 +140,15 @@ static int omap_gem_dmabuf_mmap(struct dma_buf *buffer, | |||
140 | struct vm_area_struct *vma) | 140 | struct vm_area_struct *vma) |
141 | { | 141 | { |
142 | struct drm_gem_object *obj = buffer->priv; | 142 | struct drm_gem_object *obj = buffer->priv; |
143 | struct drm_device *dev = obj->dev; | ||
143 | int ret = 0; | 144 | int ret = 0; |
144 | 145 | ||
145 | if (WARN_ON(!obj->filp)) | 146 | if (WARN_ON(!obj->filp)) |
146 | return -EINVAL; | 147 | return -EINVAL; |
147 | 148 | ||
149 | mutex_lock(&dev->struct_mutex); | ||
148 | ret = drm_gem_mmap_obj(obj, omap_gem_mmap_size(obj), vma); | 150 | ret = drm_gem_mmap_obj(obj, omap_gem_mmap_size(obj), vma); |
151 | mutex_unlock(&dev->struct_mutex); | ||
149 | if (ret < 0) | 152 | if (ret < 0) |
150 | return ret; | 153 | return ret; |
151 | 154 | ||