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

Commit 39146d6f authored by Daniel Vetter's avatar Daniel Vetter Committed by Russell King
Browse files

drm/armada: 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).

v2: Split out the leak fix in dump_map_offset into a separate patch as
requested by Russell. Also align labels the same way as before to
stick with local coding style.

Signed-off-by: default avatarDaniel Vetter <daniel.vetter@intel.com>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent 8d6185b5

drivers/gpu/drm/armada/armada_gem.c

+2 −6
Original line number Diff line number Diff line
@@ -274,12 +274,10 @@ int armada_gem_dumb_map_offset(struct drm_file *file, struct drm_device *dev, 
	struct armada_gem_object *obj;

	int ret = 0;



	mutex_lock(&dev->struct_mutex);

	obj = armada_gem_object_lookup(dev, file, handle);

	if (!obj) {

		DRM_ERROR("failed to lookup gem object\n");

		ret = -EINVAL;

		goto err_unlock;

		return -EINVAL;

	}



	/* Don't allow imported objects to be mapped */
@@ -295,9 +293,7 @@ int armada_gem_dumb_map_offset(struct drm_file *file, struct drm_device *dev, 
	}



 err_unref:

	drm_gem_object_unreference(&obj->obj);

 err_unlock:

	mutex_unlock(&dev->struct_mutex);

	drm_gem_object_unreference_unlocked(&obj->obj);



	return ret;

}