diff options
author | Daniel Vetter <daniel.vetter@ffwll.ch> | 2015-07-09 17:32:36 -0400 |
---|---|---|
committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2015-08-10 07:36:55 -0400 |
commit | a66b2ea224c40cf341ca2096aad225536aa25956 (patch) | |
tree | dba9161a090599d464f548e5cc2d0d2d6a88cbfb /drivers/gpu/drm/ast/ast_main.c | |
parent | 8d77a9404ec38be34ffc491a2022022a56e72c90 (diff) |
drm/ast: 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>
Diffstat (limited to 'drivers/gpu/drm/ast/ast_main.c')
-rw-r--r-- | drivers/gpu/drm/ast/ast_main.c | 16 |
1 files changed, 5 insertions, 11 deletions
diff --git a/drivers/gpu/drm/ast/ast_main.c b/drivers/gpu/drm/ast/ast_main.c index 035dacc93382..838217f8ce7d 100644 --- a/drivers/gpu/drm/ast/ast_main.c +++ b/drivers/gpu/drm/ast/ast_main.c | |||
@@ -571,24 +571,18 @@ ast_dumb_mmap_offset(struct drm_file *file, | |||
571 | uint64_t *offset) | 571 | uint64_t *offset) |
572 | { | 572 | { |
573 | struct drm_gem_object *obj; | 573 | struct drm_gem_object *obj; |
574 | int ret; | ||
575 | struct ast_bo *bo; | 574 | struct ast_bo *bo; |
576 | 575 | ||
577 | mutex_lock(&dev->struct_mutex); | ||
578 | obj = drm_gem_object_lookup(dev, file, handle); | 576 | obj = drm_gem_object_lookup(dev, file, handle); |
579 | if (obj == NULL) { | 577 | if (obj == NULL) |
580 | ret = -ENOENT; | 578 | return -ENOENT; |
581 | goto out_unlock; | ||
582 | } | ||
583 | 579 | ||
584 | bo = gem_to_ast_bo(obj); | 580 | bo = gem_to_ast_bo(obj); |
585 | *offset = ast_bo_mmap_offset(bo); | 581 | *offset = ast_bo_mmap_offset(bo); |
586 | 582 | ||
587 | drm_gem_object_unreference(obj); | 583 | drm_gem_object_unreference_unlocked(obj); |
588 | ret = 0; | 584 | |
589 | out_unlock: | 585 | return 0; |
590 | mutex_unlock(&dev->struct_mutex); | ||
591 | return ret; | ||
592 | 586 | ||
593 | } | 587 | } |
594 | 588 | ||