All of lore.kernel.org
 help / color / mirror / Atom feed
From: Daniel Vetter <daniel.vetter@ffwll.ch>
To: DRI Development <dri-devel@lists.freedesktop.org>
Cc: Daniel Vetter <daniel.vetter@ffwll.ch>,
	Daniel Vetter <daniel.vetter@intel.com>
Subject: [PATCH] drm/tegra: don't take dev->struct_mutex in mmap offset ioctl
Date: Thu, 15 Oct 2015 14:35:04 +0200	[thread overview]
Message-ID: <1444912504-13581-1-git-send-email-daniel.vetter@ffwll.ch> (raw)
In-Reply-To: <1444894601-5200-6-git-send-email-daniel.vetter@ffwll.ch>

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: Finally get rid of the copypasta from another commit in this
commit message. And convert to _unlocked like we need to (Patrik).

Cc: Patrik Jakobsson <patrik.r.jakobsson@gmail.com>
Cc: Thierry Reding <thierry.reding@gmail.com>
Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
---
 drivers/gpu/drm/tegra/gem.c | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/drivers/gpu/drm/tegra/gem.c b/drivers/gpu/drm/tegra/gem.c
index 01e16e146bfe..fb712316c522 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;
 	}
 
@@ -421,9 +418,7 @@ int tegra_bo_dumb_map_offset(struct drm_file *file, struct drm_device *drm,
 
 	*offset = drm_vma_node_offset_addr(&bo->gem.vma_node);
 
-	drm_gem_object_unreference(gem);
-
-	mutex_unlock(&drm->struct_mutex);
+	drm_gem_object_unreference_unlocked(gem);
 
 	return 0;
 }
-- 
2.5.1

_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/dri-devel

  reply	other threads:[~2015-10-15 12:32 UTC|newest]

Thread overview: 46+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-10-15  7:36 [PATCH 00/25] dev->struct_mutex crusade (cont'd) Daniel Vetter
2015-10-15  7:36 ` [PATCH 01/25] drm/armada: Plug leak in dumb_map_offset Daniel Vetter
2015-10-15  7:36 ` [PATCH 02/25] drm/armada: Don't grab dev->struct_mutex for in mmap offset ioctl Daniel Vetter
2015-10-15  7:36 ` [PATCH 03/25] drm/armada: Drop struct_mutex from cursor paths Daniel Vetter
2015-10-15  7:36 ` [PATCH 04/25] drm/armada: Use a private mutex to protect priv->linear Daniel Vetter
2015-10-15  7:36 ` [PATCH 05/25] drm/tegra: don't take dev->struct_mutex in mmap offset ioctl Daniel Vetter
2015-10-15 12:35   ` Daniel Vetter [this message]
2015-10-15 12:40     ` [PATCH] " Patrik Jakobsson
2015-10-21 11:23     ` Thierry Reding
2015-10-15  7:36 ` [PATCH 06/25] drm/tegra: Use drm_gem_object_reference_unlocked Daniel Vetter
2015-10-21 11:25   ` Thierry Reding
2015-10-15  7:36 ` [PATCH 07/25] drm/vgem: Drop vgem_drm_gem_mmap Daniel Vetter
2015-10-15  7:36 ` [PATCH 08/25] drm/gem: Drop struct_mutex requirement from drm_gem_mmap_obj Daniel Vetter
2015-10-15  8:34   ` David Herrmann
2015-10-15  7:36 ` [PATCH 09/25] drm/gem: Check locking in drm_gem_object_unreference Daniel Vetter
2015-10-15  8:36   ` David Herrmann
2015-10-15  8:55     ` Daniel Vetter
2015-10-15  8:56       ` David Herrmann
2015-10-15  7:36 ` [PATCH 10/25] drm/gem: Use container_of in drm_gem_object_free Daniel Vetter
2015-10-15  8:36   ` David Herrmann
2015-10-15  7:36 ` [PATCH 11/25] drm/gem: Use kref_get_unless_zero for the weak mmap references Daniel Vetter
2015-10-15  8:46   ` David Herrmann
2015-10-15  9:33   ` [PATCH] " Daniel Vetter
2015-10-15 10:06     ` Chris Wilson
2015-10-15 11:11       ` Daniel Vetter
2015-10-15 12:31         ` Daniel Vetter
2015-10-15  7:36 ` [PATCH 12/25] drm/gma500: Use correct unref in the gem bo create function Daniel Vetter
2015-10-15 12:48   ` Patrik Jakobsson
2015-10-15  7:36 ` [PATCH 13/25] drm/gma500: Drop dev->struct_mutex from modeset code Daniel Vetter
2015-10-15 13:07   ` Patrik Jakobsson
2015-10-15  7:36 ` [PATCH 14/25] drm/gma500: Drop dev->struct_mutex from fbdev init/teardown code Daniel Vetter
2015-10-15 13:24   ` Patrik Jakobsson
2015-10-15  7:36 ` [PATCH 15/25] drm/gma500: Drop dev->struct_mutex from mmap offset function Daniel Vetter
2015-10-15 17:04   ` Patrik Jakobsson
2015-10-15  7:36 ` [PATCH 16/25] drm/gma500: Add driver private mutex for the fault handler Daniel Vetter
2015-10-15  7:36 ` [PATCH 17/25] drm/nouveau: Drop dev->struct_mutex from fbdev init Daniel Vetter
2015-10-15  7:36 ` [PATCH 18/25] drm/radeon: Use rdev->gem.mutex to protect hyperz/cmask owners Daniel Vetter
2015-10-15  8:27   ` Christian König
2015-10-15 14:24     ` Alex Deucher
2015-10-15  7:36 ` [PATCH 19/25] drm/exynos: Drop dev->struct_mutex from mmap offset function Daniel Vetter
2015-10-15  7:36 ` [PATCH 20/25] drm/exynos: drop struct_mutex from exynos_gem_map_sgt_with_dma Daniel Vetter
2015-10-15  7:36 ` [PATCH 21/25] drm/exynos: drop struct_mutex from exynos_drm_gem_get_ioctl Daniel Vetter
2015-10-15  7:36 ` [PATCH 22/25] drm/exynos: drop struct_mutex from fbdev setup Daniel Vetter
2015-10-15  7:36 ` [PATCH 23/25] drm/vgem: Simplify dum_map Daniel Vetter
2015-10-15  7:36 ` [PATCH 24/25] drm/vgem: Move get_pages to gem_create Daniel Vetter
2015-10-15  7:36 ` [PATCH 25/25] drm/vgem: Drop dev->struct_mutex Daniel Vetter

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1444912504-13581-1-git-send-email-daniel.vetter@ffwll.ch \
    --to=daniel.vetter@ffwll.ch \
    --cc=daniel.vetter@intel.com \
    --cc=dri-devel@lists.freedesktop.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.