hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

drm/bochs: Don't grab dev->struct_mutex for in mmap offset ioctl 

Since David Herrmann's mmap vma manager rework we don't need to grab
dev->struct_mutex any more to prevent races when looking up the mmap
offset. Drop it and instead don't forget to use the unref_unlocked
variant (since the drm core still cares).

Reviewed-by: Thierry Reding <treding@nvidia.com>
Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
This commit is contained in:
Daniel Vetter 2015-07-09 23:32:37 +02:00
parent a66b2ea224
commit 37ae75c8fd
1 changed files with 4 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
drivers/gpu/drm/bochs/bochs_mm.c
View File

@ -454,25 +454,17 @@ int bochs_dumb_mmap_offset(struct drm_file *file, struct drm_device *dev,
uint32_t handle, uint64_t *offset) uint32_t handle, uint64_t *offset)
{ {
struct drm_gem_object *obj; struct drm_gem_object *obj;
int ret;
struct bochs_bo *bo; struct bochs_bo *bo;
mutex_lock(&dev->struct_mutex);
obj = drm_gem_object_lookup(dev, file, handle); obj = drm_gem_object_lookup(dev, file, handle);
if (obj == NULL) { if (obj == NULL)
ret = -ENOENT; return -ENOENT;
goto out_unlock;
}
bo = gem_to_bochs_bo(obj); bo = gem_to_bochs_bo(obj);
*offset = bochs_bo_mmap_offset(bo); *offset = bochs_bo_mmap_offset(bo);
drm_gem_object_unreference(obj); drm_gem_object_unreference_unlocked(obj);
ret = 0; return 0;
out_unlock:
mutex_unlock(&dev->struct_mutex);
return ret;
} }
/* ---------------------------------------------------------------------- */ /* ---------------------------------------------------------------------- */