diff options
| author |   Daniel Vetter <daniel.vetter@ffwll.ch> | 2015-10-15 09:36:25 +0200 |
|---|---|---|
| committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2015-10-19 11:00:35 +0200 |
| commit | ef4c6270bf2867e2f8032e9614d1a8cfc6c71663 (patch) | |
| tree | 39488f8a6541fd98e06daccfc3a9b58f0087d44c /include/drm | |
| parent | drm/gem: Drop struct_mutex requirement from drm_gem_mmap_obj (diff) | |
| download | linux-dev-ef4c6270bf2867e2f8032e9614d1a8cfc6c71663.tar.xz linux-dev-ef4c6270bf2867e2f8032e9614d1a8cfc6c71663.zip | |
drm/gem: Check locking in drm_gem_object_unreference
Pretty soon only some drivers will need dev->struct_mutex in their
gem_free_object callbacks. Hence it's really important to make sure
everything still keeps getting this right.
v2: Don't check for locking before we check for non-NULL obj. Spotted
by Dan Carpenter.
Link: http://mid.gmane.org/1444894601-5200-10-git-send-email-daniel.vetter@ffwll.ch
Reviewed-by: David Herrmann <dh.herrmann@gmail.com>
Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
Diffstat (limited to 'include/drm')
| -rw-r--r-- | include/drm/drm_gem.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/include/drm/drm_gem.h b/include/drm/drm_gem.h index 7a592d7e398b..15e7f007380f 100644 --- a/include/drm/drm_gem.h +++ b/include/drm/drm_gem.h @@ -142,8 +142,11 @@ drm_gem_object_reference(struct drm_gem_object *obj) static inline void drm_gem_object_unreference(struct drm_gem_object *obj) { - if (obj != NULL) + if (obj != NULL) { + WARN_ON(!mutex_is_locked(&obj->dev->struct_mutex)); + kref_put(&obj->refcount, drm_gem_object_free); + } } static inline void |