From: Daniel Vetter <daniel.vetter@ffwll.ch>
To: DRI Development <dri-devel@lists.freedesktop.org>
Cc: Daniel Vetter <daniel.vetter@intel.com>,
Daniel Vetter <daniel.vetter@ffwll.ch>,
Intel Graphics Development <intel-gfx@lists.freedesktop.org>,
Russell King <rmk+kernel@arm.linux.org.uk>
Subject: [PATCH 13/29] drm/armada: Use a private mutex to protect priv->linear
Date: Mon, 23 Nov 2015 10:32:46 +0100 [thread overview]
Message-ID: <1448271183-20523-14-git-send-email-daniel.vetter@ffwll.ch> (raw)
In-Reply-To: <1448271183-20523-1-git-send-email-daniel.vetter@ffwll.ch>
Reusing the Big DRM Lock just leaks, and the few things left that
dev->struct_mutex protected are very well contained - it's just the
linear drm_mm manager.
With this armada is completely struct_mutex free!
Cc: Russell King <rmk+kernel@arm.linux.org.uk>
Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
---
drivers/gpu/drm/armada/armada_debugfs.c | 4 ++--
drivers/gpu/drm/armada/armada_drm.h | 3 ++-
drivers/gpu/drm/armada/armada_drv.c | 1 +
drivers/gpu/drm/armada/armada_gem.c | 10 +++++-----
4 files changed, 10 insertions(+), 8 deletions(-)
diff --git a/drivers/gpu/drm/armada/armada_debugfs.c b/drivers/gpu/drm/armada/armada_debugfs.c
index 471e45627f1e..d4f7ab0a30d4 100644
--- a/drivers/gpu/drm/armada/armada_debugfs.c
+++ b/drivers/gpu/drm/armada/armada_debugfs.c
@@ -21,9 +21,9 @@ static int armada_debugfs_gem_linear_show(struct seq_file *m, void *data)
struct armada_private *priv = dev->dev_private;
int ret;
- mutex_lock(&dev->struct_mutex);
+ mutex_lock(&priv->linear_lock);
ret = drm_mm_dump_table(m, &priv->linear);
- mutex_unlock(&dev->struct_mutex);
+ mutex_unlock(&priv->linear_lock);
return ret;
}
diff --git a/drivers/gpu/drm/armada/armada_drm.h b/drivers/gpu/drm/armada/armada_drm.h
index 4df6f2af2b21..6d2d8be38297 100644
--- a/drivers/gpu/drm/armada/armada_drm.h
+++ b/drivers/gpu/drm/armada/armada_drm.h
@@ -57,7 +57,8 @@ struct armada_private {
DECLARE_KFIFO(fb_unref, struct drm_framebuffer *, 8);
struct drm_fb_helper *fbdev;
struct armada_crtc *dcrtc[2];
- struct drm_mm linear;
+ struct drm_mm linear; /* protectec by linear_lock */
+ struct mutex linear_lock;
struct drm_property *csc_yuv_prop;
struct drm_property *csc_rgb_prop;
struct drm_property *colorkey_prop;
diff --git a/drivers/gpu/drm/armada/armada_drv.c b/drivers/gpu/drm/armada/armada_drv.c
index 77ab93d60125..3bd7e1cde99e 100644
--- a/drivers/gpu/drm/armada/armada_drv.c
+++ b/drivers/gpu/drm/armada/armada_drv.c
@@ -102,6 +102,7 @@ static int armada_drm_load(struct drm_device *dev, unsigned long flags)
dev->mode_config.preferred_depth = 24;
dev->mode_config.funcs = &armada_drm_mode_config_funcs;
drm_mm_init(&priv->linear, mem->start, resource_size(mem));
+ mutex_init(&priv->linear_lock);
ret = component_bind_all(dev->dev, dev);
if (ret)
diff --git a/drivers/gpu/drm/armada/armada_gem.c b/drivers/gpu/drm/armada/armada_gem.c
index e3a86b96af2a..a43690ab18b9 100644
--- a/drivers/gpu/drm/armada/armada_gem.c
+++ b/drivers/gpu/drm/armada/armada_gem.c
@@ -46,7 +46,7 @@ static size_t roundup_gem_size(size_t size)
return roundup(size, PAGE_SIZE);
}
-/* dev->struct_mutex is held here */
+/* dev_priv->linear_lock is held here */
void armada_gem_free_object(struct drm_gem_object *obj)
{
struct armada_gem_object *dobj = drm_to_armada_gem(obj);
@@ -144,10 +144,10 @@ armada_gem_linear_back(struct drm_device *dev, struct armada_gem_object *obj)
if (!node)
return -ENOSPC;
- mutex_lock(&dev->struct_mutex);
+ mutex_lock(&priv->linear_lock);
ret = drm_mm_insert_node(&priv->linear, node, size, align,
DRM_MM_SEARCH_DEFAULT);
- mutex_unlock(&dev->struct_mutex);
+ mutex_unlock(&priv->linear_lock);
if (ret) {
kfree(node);
return ret;
@@ -158,9 +158,9 @@ armada_gem_linear_back(struct drm_device *dev, struct armada_gem_object *obj)
/* Ensure that the memory we're returning is cleared. */
ptr = ioremap_wc(obj->linear->start, size);
if (!ptr) {
- mutex_lock(&dev->struct_mutex);
+ mutex_lock(&priv->linear_lock);
drm_mm_remove_node(obj->linear);
- mutex_unlock(&dev->struct_mutex);
+ mutex_unlock(&priv->linear_lock);
kfree(obj->linear);
obj->linear = NULL;
return -ENOMEM;
--
2.5.1
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/dri-devel
next prev parent reply other threads:[~2015-11-23 9:33 UTC|newest]
Thread overview: 48+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-11-23 9:32 [PATCH 00/29] dev->struct_mutex crusade, once more Daniel Vetter
2015-11-23 9:32 ` [PATCH 01/29] drm/armada: Use unlocked gem unreferencing Daniel Vetter
2015-11-23 9:32 ` [PATCH 02/29] drm/nouveau: " Daniel Vetter
2015-11-23 9:32 ` [PATCH 03/29] drm/omapdrm: " Daniel Vetter
2015-11-23 9:32 ` [PATCH 04/29] drm/amdgpu: " Daniel Vetter
2015-11-23 9:56 ` Christian König
2015-11-23 9:32 ` [PATCH 05/29] drm/radeon: " Daniel Vetter
2015-11-23 9:32 ` [PATCH 06/29] drm/qxl: " Daniel Vetter
2015-11-23 9:32 ` [PATCH 07/29] drm/tegra: " Daniel Vetter
2015-11-23 10:00 ` Thierry Reding
2015-11-23 9:32 ` [PATCH 08/29] drm/msm: " Daniel Vetter
2015-11-23 9:32 ` [PATCH 09/29] drm/udl: " Daniel Vetter
2015-11-23 9:32 ` [PATCH 10/29] drm/armada: Plug leak in dumb_map_offset Daniel Vetter
2015-11-23 9:32 ` [PATCH 11/29] drm/armada: Don't grab dev->struct_mutex for in mmap offset ioctl Daniel Vetter
2015-11-23 9:32 ` [PATCH 12/29] drm/armada: Drop struct_mutex from cursor paths Daniel Vetter
2015-12-03 16:08 ` Russell King - ARM Linux
2015-12-04 7:51 ` Daniel Vetter
2015-11-23 9:32 ` Daniel Vetter [this message]
2015-11-23 17:40 ` [PATCH 13/29] drm/armada: Use a private mutex to protect priv->linear Russell King - ARM Linux
2015-11-23 20:17 ` Daniel Vetter
2015-11-24 9:00 ` [PATCH] " Daniel Vetter
2015-11-23 9:32 ` [PATCH 14/29] drm/tegra: don't take dev->struct_mutex in mmap offset ioctl Daniel Vetter
2015-11-23 10:00 ` Thierry Reding
2015-11-23 9:32 ` [PATCH 15/29] drm/tegra: Use drm_gem_object_unreference_unlocked Daniel Vetter
2015-11-23 10:01 ` Thierry Reding
2015-11-23 9:32 ` [PATCH 16/29] drm/gma500: Use correct unref in the gem bo create function Daniel Vetter
2015-11-23 9:32 ` [PATCH 17/29] drm/gma500: Drop dev->struct_mutex from modeset code Daniel Vetter
2015-11-23 9:32 ` [PATCH 18/29] drm/gma500: Drop dev->struct_mutex from fbdev init/teardown code Daniel Vetter
2015-11-23 9:32 ` [PATCH 19/29] drm/gma500: Drop dev->struct_mutex from mmap offset function Daniel Vetter
2015-11-23 9:32 ` [PATCH 20/29] drm/gma500: Add driver private mutex for the fault handler Daniel Vetter
2015-11-23 9:32 ` [PATCH 21/29] drm/nouveau: Drop dev->struct_mutex from fbdev init Daniel Vetter
2015-11-23 9:32 ` [PATCH 22/29] drm/exynos: Drop dev->struct_mutex from mmap offset function Daniel Vetter
2015-11-23 10:00 ` Daniel Stone
2015-11-23 9:32 ` [PATCH 23/29] drm/exynos: drop struct_mutex from exynos_gem_map_sgt_with_dma Daniel Vetter
2015-11-23 10:01 ` Daniel Stone
2015-11-23 9:32 ` [PATCH 24/29] drm/exynos: drop struct_mutex from exynos_drm_gem_get_ioctl Daniel Vetter
2015-11-23 10:00 ` Daniel Stone
2015-11-23 9:32 ` [PATCH 25/29] drm/exynos: drop struct_mutex from fbdev setup Daniel Vetter
2015-11-23 9:59 ` Daniel Stone
2015-11-23 9:32 ` [PATCH 26/29] drm/vgem: Simplify dum_map Daniel Vetter
2015-11-23 9:33 ` [PATCH 27/29] drm/vgem: Move get_pages to gem_create Daniel Vetter
2016-01-05 15:52 ` poma
2015-11-23 9:33 ` [PATCH 28/29] drm/vgem: Drop dev->struct_mutex Daniel Vetter
2015-11-23 9:33 ` [PATCH 29/29] drm/vma_manage: Drop has_offset Daniel Vetter
2015-11-23 9:33 ` [PATCH] v2: Also add a DRIVER_* check like for all other maps functions to really short-circuit the code. And give drm_legacy_rmmap used by the dev unregister code the same treatment Daniel Vetter
2015-11-23 10:15 ` [Intel-gfx] " Jani Nikula
2015-11-23 10:13 ` Daniel Vetter
2015-12-07 8:14 ` [PATCH 00/29] dev->struct_mutex crusade, once more 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=1448271183-20523-14-git-send-email-daniel.vetter@ffwll.ch \
--to=daniel.vetter@ffwll.ch \
--cc=daniel.vetter@intel.com \
--cc=dri-devel@lists.freedesktop.org \
--cc=intel-gfx@lists.freedesktop.org \
--cc=rmk+kernel@arm.linux.org.uk \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).