Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a66b2ea2 authored by Daniel Vetter's avatar Daniel Vetter
Browse files

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: default avatarThierry Reding <treding@nvidia.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@intel.com>
parent 8d77a940

drivers/gpu/drm/ast/ast_main.c

+5 −11
Original line number Original line Diff line number Diff line
@@ -571,24 +571,18 @@ ast_dumb_mmap_offset(struct drm_file *file, 
		     uint64_t *offset)

		     uint64_t *offset)

{

{

	struct drm_gem_object *obj;

	struct drm_gem_object *obj;

	int ret;

	struct ast_bo *bo;

	struct ast_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_ast_bo(obj);

	bo = gem_to_ast_bo(obj);

	*offset = ast_bo_mmap_offset(bo);

	*offset = ast_bo_mmap_offset(bo);





	drm_gem_object_unreference(obj);

	drm_gem_object_unreference_unlocked(obj);

	ret = 0;



out_unlock:

	return 0;

	mutex_unlock(&dev->struct_mutex);

	return ret;





}

}