Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

drm/cirrus: 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>

+4 -11
+4 -11
drivers/gpu/drm/cirrus/cirrus_main.c
··· 293 293 uint64_t *offset) 294 294 { 295 295 struct drm_gem_object *obj; 296 - int ret; 297 296 struct cirrus_bo *bo; 298 297 299 - mutex_lock(&dev->struct_mutex); 300 298 obj = drm_gem_object_lookup(dev, file, handle); 301 - if (obj == NULL) { 302 - ret = -ENOENT; 303 - goto out_unlock; 304 - } 299 + if (obj == NULL) 300 + return -ENOENT; 305 301 306 302 bo = gem_to_cirrus_bo(obj); 307 303 *offset = cirrus_bo_mmap_offset(bo); 308 304 309 - drm_gem_object_unreference(obj); 310 - ret = 0; 311 - out_unlock: 312 - mutex_unlock(&dev->struct_mutex); 313 - return ret; 305 + drm_gem_object_unreference_unlocked(obj); 314 306 307 + return 0; 315 308 } 316 309 317 310 bool cirrus_check_framebuffer(struct cirrus_device *cdev, int width, int height,