path: root/drivers/gpu/drm/drm_info.c
diff options
authorDaniel Vetter <>2013-08-15 00:02:44 +0200
committerChanho Park <>2014-11-21 19:13:43 +0900
commitdf1db9bf3ff56007e063b26f4c4a4c1b478c192a (patch)
tree930c2ef668bcaa557c4b10e6210e29ec2ea25644 /drivers/gpu/drm/drm_info.c
parent68cb588e2f0e2237cc80c276e6d90ea46ac97b7c (diff)
drm/gem: switch dev->object_name_lock to a mutex
I want to wrap the creation of a dma-buf from a gem object in it, so that the obj->export_dma_buf cache can be atomically filled in. Instead of creating a new mutex just for that variable I've figured I can reuse the existing dev->object_name_lock, especially since the new semantics will exactly mirror the flink obj->name already protected by that lock. v2: idr_preload/idr_preload_end is now an atomic section, so need to move the mutex locking outside. [airlied: fix up conflict with patch to make debugfs use lock] Signed-off-by: Daniel Vetter <> Signed-off-by: Dave Airlie <> Conflicts: drivers/gpu/drm/drm_info.c Change-Id: Ic4ca630b9c6092c942208ee9a04409d4f6561fc0
Diffstat (limited to 'drivers/gpu/drm/drm_info.c')
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/gpu/drm/drm_info.c b/drivers/gpu/drm/drm_info.c
index f4b348c8f33..53298320080 100644
--- a/drivers/gpu/drm/drm_info.c
+++ b/drivers/gpu/drm/drm_info.c
@@ -218,7 +218,11 @@ int drm_gem_name_info(struct seq_file *m, void *data)
struct drm_device *dev = node->minor->dev;
seq_printf(m, " name size handles refcount\n");
+ mutex_lock(&dev->object_name_lock);
idr_for_each(&dev->object_name_idr, drm_gem_one_name_info, m);
+ mutex_unlock(&dev->object_name_lock);
return 0;