Skip to content

Commit

Permalink
drm: Improve kerneldoc for new mode object refcounting
Browse files Browse the repository at this point in the history
Slipped through the cracks in my review. The one issue I spotted
is that drm_mode_object_find now acquires references and can be
used on FB objects, which caused follow-on bugs in get/set_prop ioctls.
Follow-up patches will fix that.

[airlied: fixup some incr fb/decr object mixups]

Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: Dave Airlie <airlied@redhat.com>
  • Loading branch information
Daniel Vetter authored and Dave Airlie committed Apr 26, 2016
1 parent 944a3f3 commit 0598142
Showing 1 changed file with 15 additions and 7 deletions.
22 changes: 15 additions & 7 deletions drivers/gpu/drm/drm_crtc.c
Original file line number Diff line number Diff line change
Expand Up @@ -380,10 +380,9 @@ static struct drm_mode_object *_object_find(struct drm_device *dev,
* @id: id of the mode object
* @type: type of the mode object
*
* Note that framebuffers cannot be looked up with this functions - since those
* are reference counted, they need special treatment. Even with
* DRM_MODE_OBJECT_ANY (although that will simply return NULL
* rather than WARN_ON()).
* This function is used to look up a modeset object. It will acquire a
* reference for reference counted objects. This reference must be dropped again
* by callind drm_mode_object_unreference().
*/
struct drm_mode_object *drm_mode_object_find(struct drm_device *dev,
uint32_t id, uint32_t type)
Expand All @@ -398,6 +397,14 @@ struct drm_mode_object *drm_mode_object_find(struct drm_device *dev,
}
EXPORT_SYMBOL(drm_mode_object_find);

/**
* drm_mode_object_unreference - decr the object refcnt
* @obj: mode_object
*
* This functions decrements the object's refcount if it is a refcounted modeset
* object. It is a no-op on any other object. This is used to drop references
* acquired with drm_mode_object_reference().
*/
void drm_mode_object_unreference(struct drm_mode_object *obj)
{
if (obj->free_cb) {
Expand All @@ -408,11 +415,12 @@ void drm_mode_object_unreference(struct drm_mode_object *obj)
EXPORT_SYMBOL(drm_mode_object_unreference);

/**
* drm_mode_object_reference - incr the fb refcnt
* drm_mode_object_reference - incr the object refcnt
* @obj: mode_object
*
* This function operates only on refcounted objects.
* This functions increments the object's refcount.
* This functions increments the object's refcount if it is a refcounted modeset
* object. It is a no-op on any other object. References should be dropped again
* by calling drm_mode_object_unreference().
*/
void drm_mode_object_reference(struct drm_mode_object *obj)
{
Expand Down

0 comments on commit 0598142

Please sign in to comment.