diff options
| author | Daniel Vetter <daniel.vetter@ffwll.ch> | 2013-08-15 00:02:44 +0200 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2013-08-21 12:58:01 +1000 |
| commit | cd4f013f3a4b6a55d484cc2e206dc08e055e5291 (patch) | |
| tree | 1af8117ef7955b830c9af6a54a9cafe24943641d /include/drm | |
| parent | 84341c280acb8217a301344082c7ad8b9af870a6 (diff) | |
| download | op-kernel-dev-cd4f013f3a4b6a55d484cc2e206dc08e055e5291.zip op-kernel-dev-cd4f013f3a4b6a55d484cc2e206dc08e055e5291.tar.gz | |
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>
Diffstat (limited to 'include/drm')
| -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 7782dbb..bf05847 100644 --- a/include/drm/drmP.h +++ b/include/drm/drmP.h @@ -1196,7 +1196,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; |
