From: Daniel Vetter Date: Tue, 14 Mar 2017 14:07:33 +0000 (+0100) Subject: Merge tag 'doc-4.11-images' of git://git.lwn.net/linux into drm-misc-next X-Git-Tag: v4.12-rc1~86^2~28^2~20 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=b70366e5d31788650b2a5cec5cd13ea80ac7e44a;p=platform%2Fkernel%2Flinux-exynos.git Merge tag 'doc-4.11-images' of git://git.lwn.net/linux into drm-misc-next Pointer for Markus's image conversion work. We need this so we can merge all the pretty drm graphs for 4.12. Signed-off-by: Daniel Vetter --- b70366e5d31788650b2a5cec5cd13ea80ac7e44a diff --cc drivers/gpu/drm/drm_mode_object.c index 2eb0792dfaf3,220a6c1f4ab9..da9a9adbcc98 --- a/drivers/gpu/drm/drm_mode_object.c +++ b/drivers/gpu/drm/drm_mode_object.c @@@ -151,12 -155,12 +151,12 @@@ EXPORT_SYMBOL(drm_mode_object_find) * * This function 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(). + * acquired with drm_mode_object_get(). */ -void drm_mode_object_unreference(struct drm_mode_object *obj) +void drm_mode_object_put(struct drm_mode_object *obj) { if (obj->free_cb) { - DRM_DEBUG("OBJ ID: %d (%d)\n", obj->id, atomic_read(&obj->refcount.refcount)); + DRM_DEBUG("OBJ ID: %d (%d)\n", obj->id, kref_read(&obj->refcount)); kref_put(&obj->refcount, obj->free_cb); } } @@@ -168,12 -172,12 +168,12 @@@ EXPORT_SYMBOL(drm_mode_object_put) * * This function 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(). + * by calling drm_mode_object_put(). */ -void drm_mode_object_reference(struct drm_mode_object *obj) +void drm_mode_object_get(struct drm_mode_object *obj) { if (obj->free_cb) { - DRM_DEBUG("OBJ ID: %d (%d)\n", obj->id, atomic_read(&obj->refcount.refcount)); + DRM_DEBUG("OBJ ID: %d (%d)\n", obj->id, kref_read(&obj->refcount)); kref_get(&obj->refcount); } }