Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

drm: Rename drm_mode_object_get()

Subsequent patches will introduce reference counting APIs that are more
consistent with similar APIs throughout the Linux kernel. These APIs use
the _get() and _put() suffixes and will collide with this existing
function.

Rename the function to drm_mode_object_add() which is a slightly more
accurate description of what it does. Also the kerneldoc for this
function gives an indication that it's badly named because it doesn't
actually acquire a reference to anything.

Reviewed-by: Sean Paul <seanpaul@chromium.org>
Acked-by: Christian König <christian.koenig@amd.com>
Signed-off-by: Thierry Reding <treding@nvidia.com>
Link: http://patchwork.freedesktop.org/patch/msgid/20170228144643.5668-2-thierry.reding@gmail.com

+24 -30
+3 -3
drivers/gpu/drm/drm_connector.c
··· 175 175 struct ida *connector_ida = 176 176 &drm_connector_enum_list[connector_type].ida; 177 177 178 - ret = drm_mode_object_get_reg(dev, &connector->base, 179 - DRM_MODE_OBJECT_CONNECTOR, 180 - false, drm_connector_free); 178 + ret = __drm_mode_object_add(dev, &connector->base, 179 + DRM_MODE_OBJECT_CONNECTOR, 180 + false, drm_connector_free); 181 181 if (ret) 182 182 return ret; 183 183
+1 -1
drivers/gpu/drm/drm_crtc.c
··· 282 282 spin_lock_init(&crtc->commit_lock); 283 283 284 284 drm_modeset_lock_init(&crtc->mutex); 285 - ret = drm_mode_object_get(dev, &crtc->base, DRM_MODE_OBJECT_CRTC); 285 + ret = drm_mode_object_add(dev, &crtc->base, DRM_MODE_OBJECT_CRTC); 286 286 if (ret) 287 287 return ret; 288 288
+5 -7
drivers/gpu/drm/drm_crtc_internal.h
··· 98 98 void *data, struct drm_file *file_priv); 99 99 100 100 /* drm_mode_object.c */ 101 - int drm_mode_object_get_reg(struct drm_device *dev, 102 - struct drm_mode_object *obj, 103 - uint32_t obj_type, 104 - bool register_obj, 105 - void (*obj_free_cb)(struct kref *kref)); 101 + int __drm_mode_object_add(struct drm_device *dev, struct drm_mode_object *obj, 102 + uint32_t obj_type, bool register_obj, 103 + void (*obj_free_cb)(struct kref *kref)); 104 + int drm_mode_object_add(struct drm_device *dev, struct drm_mode_object *obj, 105 + uint32_t obj_type); 106 106 void drm_mode_object_register(struct drm_device *dev, 107 107 struct drm_mode_object *obj); 108 - int drm_mode_object_get(struct drm_device *dev, 109 - struct drm_mode_object *obj, uint32_t obj_type); 110 108 struct drm_mode_object *__drm_mode_object_find(struct drm_device *dev, 111 109 uint32_t id, uint32_t type); 112 110 void drm_mode_object_unregister(struct drm_device *dev,
+1 -1
drivers/gpu/drm/drm_encoder.c
··· 110 110 { 111 111 int ret; 112 112 113 - ret = drm_mode_object_get(dev, &encoder->base, DRM_MODE_OBJECT_ENCODER); 113 + ret = drm_mode_object_add(dev, &encoder->base, DRM_MODE_OBJECT_ENCODER); 114 114 if (ret) 115 115 return ret; 116 116
+2 -2
drivers/gpu/drm/drm_framebuffer.c
··· 638 638 639 639 fb->funcs = funcs; 640 640 641 - ret = drm_mode_object_get_reg(dev, &fb->base, DRM_MODE_OBJECT_FB, 642 - false, drm_framebuffer_free); 641 + ret = __drm_mode_object_add(dev, &fb->base, DRM_MODE_OBJECT_FB, 642 + false, drm_framebuffer_free); 643 643 if (ret) 644 644 goto out; 645 645
+7 -11
drivers/gpu/drm/drm_mode_object.c
··· 31 31 * Internal function to assign a slot in the object idr and optionally 32 32 * register the object into the idr. 33 33 */ 34 - int drm_mode_object_get_reg(struct drm_device *dev, 35 - struct drm_mode_object *obj, 36 - uint32_t obj_type, 37 - bool register_obj, 38 - void (*obj_free_cb)(struct kref *kref)) 34 + int __drm_mode_object_add(struct drm_device *dev, struct drm_mode_object *obj, 35 + uint32_t obj_type, bool register_obj, 36 + void (*obj_free_cb)(struct kref *kref)) 39 37 { 40 38 int ret; 41 39 ··· 57 59 } 58 60 59 61 /** 60 - * drm_mode_object_get - allocate a new modeset identifier 62 + * drm_mode_object_add - allocate a new modeset identifier 61 63 * @dev: DRM device 62 64 * @obj: object pointer, used to generate unique ID 63 65 * @obj_type: object type 64 66 * 65 67 * Create a unique identifier based on @ptr in @dev's identifier space. Used 66 - * for tracking modes, CRTCs and connectors. Note that despite the _get postfix 67 - * modeset identifiers are _not_ reference counted. Hence don't use this for 68 - * reference counted modeset objects like framebuffers. 68 + * for tracking modes, CRTCs and connectors. 69 69 * 70 70 * Returns: 71 71 * Zero on success, error code on failure. 72 72 */ 73 - int drm_mode_object_get(struct drm_device *dev, 73 + int drm_mode_object_add(struct drm_device *dev, 74 74 struct drm_mode_object *obj, uint32_t obj_type) 75 75 { 76 - return drm_mode_object_get_reg(dev, obj, obj_type, true, NULL); 76 + return __drm_mode_object_add(dev, obj, obj_type, true, NULL); 77 77 } 78 78 79 79 void drm_mode_object_register(struct drm_device *dev,
+1 -1
drivers/gpu/drm/drm_modes.c
··· 71 71 if (!nmode) 72 72 return NULL; 73 73 74 - if (drm_mode_object_get(dev, &nmode->base, DRM_MODE_OBJECT_MODE)) { 74 + if (drm_mode_object_add(dev, &nmode->base, DRM_MODE_OBJECT_MODE)) { 75 75 kfree(nmode); 76 76 return NULL; 77 77 }
+1 -1
drivers/gpu/drm/drm_plane.c
··· 88 88 struct drm_mode_config *config = &dev->mode_config; 89 89 int ret; 90 90 91 - ret = drm_mode_object_get(dev, &plane->base, DRM_MODE_OBJECT_PLANE); 91 + ret = drm_mode_object_add(dev, &plane->base, DRM_MODE_OBJECT_PLANE); 92 92 if (ret) 93 93 return ret; 94 94
+3 -3
drivers/gpu/drm/drm_property.c
··· 91 91 goto fail; 92 92 } 93 93 94 - ret = drm_mode_object_get(dev, &property->base, DRM_MODE_OBJECT_PROPERTY); 94 + ret = drm_mode_object_add(dev, &property->base, DRM_MODE_OBJECT_PROPERTY); 95 95 if (ret) 96 96 goto fail; 97 97 ··· 570 570 if (data) 571 571 memcpy(blob->data, data, length); 572 572 573 - ret = drm_mode_object_get_reg(dev, &blob->base, DRM_MODE_OBJECT_BLOB, 574 - true, drm_property_free_blob); 573 + ret = __drm_mode_object_add(dev, &blob->base, DRM_MODE_OBJECT_BLOB, 574 + true, drm_property_free_blob); 575 575 if (ret) { 576 576 kfree(blob); 577 577 return ERR_PTR(-EINVAL);