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: Daniel Vetter <daniel.vetter@intel.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

diff --git a/drivers/gpu/drm/armada/armada_gem.c b/drivers/gpu/drm/armada/armada_gem.c
index 2a3ef7938f30c8bdbdb03e2e44f7a72149bc4004..e3a86b96af2a6760c1dcf8e0a89f061859499f92 100644 (file)
--- a/drivers/gpu/drm/armada/armada_gem.c
+++ b/drivers/gpu/drm/armada/armada_gem.c
@@ -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;
 }