Commit be6ee102 authored by Emil Velikov's avatar Emil Velikov Committed by Emil Velikov
Browse files

drm: remove _unlocked suffix in drm_gem_object_put_unlocked 



Spelling out _unlocked for each and every driver is a annoying.
Especially if we consider how many drivers, do not know (or need to)
about the horror stories involving struct_mutex.

Just drop the suffix. It makes the API cleaner.

Done via the following script:

__from=drm_gem_object_put_unlocked
__to=drm_gem_object_put
for __file in $(git grep --name-only $__from); do
  sed -i  "s/$__from/$__to/g" $__file;
done

Pay special attention to the compat #define

v2: keep sed and #define removal separate

Cc: David Airlie <airlied@linux.ie>
Cc: Daniel Vetter <daniel@ffwll.ch>
Signed-off-by: default avatarEmil Velikov <emil.velikov@collabora.com>
Acked-by: Sam Ravnborg <sam@ravnborg.org> (v1)
Reviewed-by: default avatarSteven Price <steven.price@arm.com>
Acked-by: default avatarThomas Zimmermann <tzimmermann@suse.de>
Link: https://patchwork.freedesktop.org/patch/msgid/20200515095118.2743122-14-emil.l.velikov@gmail.com
parent 2f4dd13d

Documentation/gpu/drm-mm.rst

+1 −1
Original line number Diff line number Diff line
@@ -178,7 +178,7 @@ GEM Objects Lifetime 
--------------------



All GEM objects are reference-counted by the GEM core. References can be

acquired and release by calling drm_gem_object_get() and drm_gem_object_put_unlocked()

acquired and release by calling drm_gem_object_get() and drm_gem_object_put()

respectively.



When the last reference to a GEM object is released the GEM core calls

drivers/gpu/drm/drm_client.c

+1 −1
Original line number Diff line number Diff line
@@ -237,7 +237,7 @@ static void drm_client_buffer_delete(struct drm_client_buffer *buffer) 
	drm_gem_vunmap(buffer->gem, buffer->vaddr);



	if (buffer->gem)

		drm_gem_object_put_unlocked(buffer->gem);

		drm_gem_object_put(buffer->gem);



	if (buffer->handle)

		drm_mode_destroy_dumb(dev, buffer->handle, buffer->client->file);

drivers/gpu/drm/drm_gem.c

+13 −13
Original line number Diff line number Diff line
@@ -235,7 +235,7 @@ drm_gem_object_handle_put_unlocked(struct drm_gem_object *obj) 
	mutex_unlock(&dev->object_name_lock);



	if (final)

		drm_gem_object_put_unlocked(obj);

		drm_gem_object_put(obj);

}



/*
@@ -331,7 +331,7 @@ int drm_gem_dumb_map_offset(struct drm_file *file, struct drm_device *dev, 


	*offset = drm_vma_node_offset_addr(&obj->vma_node);

out:

	drm_gem_object_put_unlocked(obj);

	drm_gem_object_put(obj);



	return ret;

}
@@ -690,7 +690,7 @@ static int objects_lookup(struct drm_file *filp, u32 *handle, int count, 
 * Returns:

 *

 * @objs filled in with GEM object pointers. Returned GEM objects need to be

 * released with drm_gem_object_put_unlocked(). -ENOENT is returned on a lookup

 * released with drm_gem_object_put(). -ENOENT is returned on a lookup

 * failure. 0 is returned on success.

 *

 */
@@ -785,7 +785,7 @@ long drm_gem_dma_resv_wait(struct drm_file *filep, u32 handle, 
	else if (ret > 0)

		ret = 0;



	drm_gem_object_put_unlocked(obj);

	drm_gem_object_put(obj);



	return ret;

}
@@ -860,7 +860,7 @@ drm_gem_flink_ioctl(struct drm_device *dev, void *data, 


err:

	mutex_unlock(&dev->object_name_lock);

	drm_gem_object_put_unlocked(obj);

	drm_gem_object_put(obj);

	return ret;

}
@@ -898,7 +898,7 @@ drm_gem_open_ioctl(struct drm_device *dev, void *data, 


	/* drm_gem_handle_create_tail unlocks dev->object_name_lock. */

	ret = drm_gem_handle_create_tail(file_priv, obj, &handle);

	drm_gem_object_put_unlocked(obj);

	drm_gem_object_put(obj);

	if (ret)

		return ret;
@@ -991,7 +991,7 @@ EXPORT_SYMBOL(drm_gem_object_free); 
 * driver doesn't use &drm_device.struct_mutex for anything.

 *

 * For drivers not encumbered with legacy locking use

 * drm_gem_object_put_unlocked() instead.

 * drm_gem_object_put() instead.

 */

void

drm_gem_object_put_locked(struct drm_gem_object *obj)
@@ -1030,7 +1030,7 @@ void drm_gem_vm_close(struct vm_area_struct *vma) 
{

	struct drm_gem_object *obj = vma->vm_private_data;



	drm_gem_object_put_unlocked(obj);

	drm_gem_object_put(obj);

}

EXPORT_SYMBOL(drm_gem_vm_close);
@@ -1079,7 +1079,7 @@ int drm_gem_mmap_obj(struct drm_gem_object *obj, unsigned long obj_size, 
	if (obj->funcs && obj->funcs->mmap) {

		ret = obj->funcs->mmap(obj, vma);

		if (ret) {

			drm_gem_object_put_unlocked(obj);

			drm_gem_object_put(obj);

			return ret;

		}

		WARN_ON(!(vma->vm_flags & VM_DONTEXPAND));
@@ -1089,7 +1089,7 @@ int drm_gem_mmap_obj(struct drm_gem_object *obj, unsigned long obj_size, 
		else if (dev->driver->gem_vm_ops)

			vma->vm_ops = dev->driver->gem_vm_ops;

		else {

			drm_gem_object_put_unlocked(obj);

			drm_gem_object_put(obj);

			return -EINVAL;

		}
@@ -1155,13 +1155,13 @@ int drm_gem_mmap(struct file *filp, struct vm_area_struct *vma) 
		return -EINVAL;



	if (!drm_vma_node_is_allowed(node, priv)) {

		drm_gem_object_put_unlocked(obj);

		drm_gem_object_put(obj);

		return -EACCES;

	}



	if (node->readonly) {

		if (vma->vm_flags & VM_WRITE) {

			drm_gem_object_put_unlocked(obj);

			drm_gem_object_put(obj);

			return -EINVAL;

		}
@@ -1171,7 +1171,7 @@ int drm_gem_mmap(struct file *filp, struct vm_area_struct *vma) 
	ret = drm_gem_mmap_obj(obj, drm_vma_node_size(node) << PAGE_SHIFT,

			       vma);



	drm_gem_object_put_unlocked(obj);

	drm_gem_object_put(obj);



	return ret;

}

drivers/gpu/drm/drm_gem_cma_helper.c

+4 −4
Original line number Diff line number Diff line
@@ -114,7 +114,7 @@ struct drm_gem_cma_object *drm_gem_cma_create(struct drm_device *drm, 
	return cma_obj;



error:

	drm_gem_object_put_unlocked(&cma_obj->base);

	drm_gem_object_put(&cma_obj->base);

	return ERR_PTR(ret);

}

EXPORT_SYMBOL_GPL(drm_gem_cma_create);
@@ -156,7 +156,7 @@ drm_gem_cma_create_with_handle(struct drm_file *file_priv, 
	 */

	ret = drm_gem_handle_create(file_priv, gem_obj, handle);

	/* drop reference from allocate - handle holds it now. */

	drm_gem_object_put_unlocked(gem_obj);

	drm_gem_object_put(gem_obj);

	if (ret)

		return ERR_PTR(ret);
@@ -380,13 +380,13 @@ unsigned long drm_gem_cma_get_unmapped_area(struct file *filp, 
		return -EINVAL;



	if (!drm_vma_node_is_allowed(node, priv)) {

		drm_gem_object_put_unlocked(obj);

		drm_gem_object_put(obj);

		return -EACCES;

	}



	cma_obj = to_drm_gem_cma_obj(obj);



	drm_gem_object_put_unlocked(obj);

	drm_gem_object_put(obj);



	return cma_obj->vaddr ? (unsigned long)cma_obj->vaddr : -EINVAL;

}

drivers/gpu/drm/drm_gem_framebuffer_helper.c

+3 −3
Original line number Diff line number Diff line
@@ -95,7 +95,7 @@ void drm_gem_fb_destroy(struct drm_framebuffer *fb) 
	int i;



	for (i = 0; i < 4; i++)

		drm_gem_object_put_unlocked(fb->obj[i]);

		drm_gem_object_put(fb->obj[i]);



	drm_framebuffer_cleanup(fb);

	kfree(fb);
@@ -175,7 +175,7 @@ int drm_gem_fb_init_with_funcs(struct drm_device *dev, 
			 + mode_cmd->offsets[i];



		if (objs[i]->size < min_size) {

			drm_gem_object_put_unlocked(objs[i]);

			drm_gem_object_put(objs[i]);

			ret = -EINVAL;

			goto err_gem_object_put;

		}
@@ -189,7 +189,7 @@ int drm_gem_fb_init_with_funcs(struct drm_device *dev, 


err_gem_object_put:

	for (i--; i >= 0; i--)

		drm_gem_object_put_unlocked(objs[i]);

		drm_gem_object_put(objs[i]);



	return ret;

}