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).

While at it also fix a leak when this ioctl is called on an imported
buffer.

Cc: Thierry Reding <thierry.reding at gmail.com>
Signed-off-by: Daniel Vetter <daniel.vetter at intel.com>
---
 drivers/gpu/drm/tegra/gem.c | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/drivers/gpu/drm/tegra/gem.c b/drivers/gpu/drm/tegra/gem.c
index 01e16e146bfe..827838e64d6e 100644
--- a/drivers/gpu/drm/tegra/gem.c
+++ b/drivers/gpu/drm/tegra/gem.c
@@ -408,12 +408,9 @@ int tegra_bo_dumb_map_offset(struct drm_file *file, struct 
drm_device *drm,
        struct drm_gem_object *gem;
        struct tegra_bo *bo;

-       mutex_lock(&drm->struct_mutex);
-
        gem = drm_gem_object_lookup(drm, file, handle);
        if (!gem) {
                dev_err(drm->dev, "failed to lookup GEM object\n");
-               mutex_unlock(&drm->struct_mutex);
                return -EINVAL;
        }

@@ -423,8 +420,6 @@ int tegra_bo_dumb_map_offset(struct drm_file *file, struct 
drm_device *drm,

        drm_gem_object_unreference(gem);

-       mutex_unlock(&drm->struct_mutex);
-
        return 0;
 }

-- 
2.5.1

Reply via email to