diff options
| author | Daniel Vetter <daniel.vetter@ffwll.ch> | 2013-08-15 00:02:44 +0200 |
|---|---|---|
| committer | Chanho Park <chanho61.park@samsung.com> | 2014-11-21 19:13:43 +0900 |
| commit | df1db9bf3ff56007e063b26f4c4a4c1b478c192a (patch) | |
| tree | 930c2ef668bcaa557c4b10e6210e29ec2ea25644 /include | |
| parent | 68cb588e2f0e2237cc80c276e6d90ea46ac97b7c (diff) | |
| download | linux-3.10-df1db9bf3ff56007e063b26f4c4a4c1b478c192a.tar.gz linux-3.10-df1db9bf3ff56007e063b26f4c4a4c1b478c192a.tar.bz2 linux-3.10-df1db9bf3ff56007e063b26f4c4a4c1b478c192a.zip | |
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 <daniel.vetter@ffwll.ch>
Signed-off-by: Dave Airlie <airlied@redhat.com>
Conflicts:
drivers/gpu/drm/drm_info.c
Change-Id: Ic4ca630b9c6092c942208ee9a04409d4f6561fc0
Diffstat (limited to 'include')
| -rw-r--r-- | include/drm/drmP.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/drm/drmP.h b/include/drm/drmP.h index 732adc125d7..747cb7cd33b 100644 --- a/include/drm/drmP.h +++ b/include/drm/drmP.h @@ -1247,7 +1247,7 @@ struct drm_device { /** \name GEM information */ /*@{ */ - spinlock_t object_name_lock; + struct mutex object_name_lock; struct idr object_name_idr; /*@} */ int switch_power_state; |