Commit 8f5c4871 authored by Dmitry Osipenko's avatar Dmitry Osipenko
Browse files

drm/gem: Change locked/unlocked postfix of drm_gem_v/unmap() function names 



Make drm/gem API function names consistent by having locked function
use the _locked postfix in the name, while the unlocked variants don't
use the _unlocked postfix. Rename drm_gem_v/unmap() function names to
make them consistent with the rest of the API functions.

Acked-by: default avatarMaxime Ripard <mripard@kernel.org>
Reviewed-by: default avatarBoris Brezillon <boris.brezillon@collabora.com>
Suggested-by: default avatarBoris Brezillon <boris.brezillon@collabora.com>
Reviewed-by: default avatarChristian König <christian.koenig@amd.com>
Acked-by: default avatarThomas Zimmermann <tzimmermann@suse.d>
Signed-off-by: default avatarDmitry Osipenko <dmitry.osipenko@collabora.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20250322212608.40511-2-dmitry.osipenko@collabora.com
parent 2f9d5174

drivers/gpu/drm/drm_client.c

+5 −5
Original line number Diff line number Diff line
@@ -174,7 +174,7 @@ EXPORT_SYMBOL(drm_client_release); 
static void drm_client_buffer_delete(struct drm_client_buffer *buffer)

{

	if (buffer->gem) {

		drm_gem_vunmap_unlocked(buffer->gem, &buffer->map);

		drm_gem_vunmap(buffer->gem, &buffer->map);

		drm_gem_object_put(buffer->gem);

	}
@@ -252,7 +252,7 @@ int drm_client_buffer_vmap_local(struct drm_client_buffer *buffer, 


	drm_gem_lock(gem);



	ret = drm_gem_vmap(gem, map);

	ret = drm_gem_vmap_locked(gem, map);

	if (ret)

		goto err_drm_gem_vmap_unlocked;

	*map_copy = *map;
@@ -278,7 +278,7 @@ void drm_client_buffer_vunmap_local(struct drm_client_buffer *buffer) 
	struct drm_gem_object *gem = buffer->gem;

	struct iosys_map *map = &buffer->map;



	drm_gem_vunmap(gem, map);

	drm_gem_vunmap_locked(gem, map);

	drm_gem_unlock(gem);

}

EXPORT_SYMBOL(drm_client_buffer_vunmap_local);
@@ -316,7 +316,7 @@ drm_client_buffer_vmap(struct drm_client_buffer *buffer, 
	ret = drm_gem_pin_locked(gem);

	if (ret)

		goto err_drm_gem_pin_locked;

	ret = drm_gem_vmap(gem, map);

	ret = drm_gem_vmap_locked(gem, map);

	if (ret)

		goto err_drm_gem_vmap;
@@ -348,7 +348,7 @@ void drm_client_buffer_vunmap(struct drm_client_buffer *buffer) 
	struct iosys_map *map = &buffer->map;



	drm_gem_lock(gem);

	drm_gem_vunmap(gem, map);

	drm_gem_vunmap_locked(gem, map);

	drm_gem_unpin_locked(gem);

	drm_gem_unlock(gem);

}

drivers/gpu/drm/drm_gem.c

+10 −10
Original line number Diff line number Diff line
@@ -1216,7 +1216,7 @@ void drm_gem_unpin(struct drm_gem_object *obj) 
	dma_resv_unlock(obj->resv);

}



int drm_gem_vmap(struct drm_gem_object *obj, struct iosys_map *map)

int drm_gem_vmap_locked(struct drm_gem_object *obj, struct iosys_map *map)

{

	int ret;
@@ -1233,9 +1233,9 @@ int drm_gem_vmap(struct drm_gem_object *obj, struct iosys_map *map) 


	return 0;

}

EXPORT_SYMBOL(drm_gem_vmap);

EXPORT_SYMBOL(drm_gem_vmap_locked);



void drm_gem_vunmap(struct drm_gem_object *obj, struct iosys_map *map)

void drm_gem_vunmap_locked(struct drm_gem_object *obj, struct iosys_map *map)

{

	dma_resv_assert_held(obj->resv);
@@ -1248,7 +1248,7 @@ void drm_gem_vunmap(struct drm_gem_object *obj, struct iosys_map *map) 
	/* Always set the mapping to NULL. Callers may rely on this. */

	iosys_map_clear(map);

}

EXPORT_SYMBOL(drm_gem_vunmap);

EXPORT_SYMBOL(drm_gem_vunmap_locked);



void drm_gem_lock(struct drm_gem_object *obj)

{
@@ -1262,25 +1262,25 @@ void drm_gem_unlock(struct drm_gem_object *obj) 
}

EXPORT_SYMBOL(drm_gem_unlock);



int drm_gem_vmap_unlocked(struct drm_gem_object *obj, struct iosys_map *map)

int drm_gem_vmap(struct drm_gem_object *obj, struct iosys_map *map)

{

	int ret;



	dma_resv_lock(obj->resv, NULL);

	ret = drm_gem_vmap(obj, map);

	ret = drm_gem_vmap_locked(obj, map);

	dma_resv_unlock(obj->resv);



	return ret;

}

EXPORT_SYMBOL(drm_gem_vmap_unlocked);

EXPORT_SYMBOL(drm_gem_vmap);



void drm_gem_vunmap_unlocked(struct drm_gem_object *obj, struct iosys_map *map)

void drm_gem_vunmap(struct drm_gem_object *obj, struct iosys_map *map)

{

	dma_resv_lock(obj->resv, NULL);

	drm_gem_vunmap(obj, map);

	drm_gem_vunmap_locked(obj, map);

	dma_resv_unlock(obj->resv);

}

EXPORT_SYMBOL(drm_gem_vunmap_unlocked);

EXPORT_SYMBOL(drm_gem_vunmap);



/**

 * drm_gem_lock_reservations - Sets up the ww context and acquires

drivers/gpu/drm/drm_gem_framebuffer_helper.c

+3 −3
Original line number Diff line number Diff line
@@ -362,7 +362,7 @@ int drm_gem_fb_vmap(struct drm_framebuffer *fb, struct iosys_map *map, 
			ret = -EINVAL;

			goto err_drm_gem_vunmap;

		}

		ret = drm_gem_vmap_unlocked(obj, &map[i]);

		ret = drm_gem_vmap(obj, &map[i]);

		if (ret)

			goto err_drm_gem_vunmap;

	}
@@ -384,7 +384,7 @@ int drm_gem_fb_vmap(struct drm_framebuffer *fb, struct iosys_map *map, 
		obj = drm_gem_fb_get_obj(fb, i);

		if (!obj)

			continue;

		drm_gem_vunmap_unlocked(obj, &map[i]);

		drm_gem_vunmap(obj, &map[i]);

	}

	return ret;

}
@@ -411,7 +411,7 @@ void drm_gem_fb_vunmap(struct drm_framebuffer *fb, struct iosys_map *map) 
			continue;

		if (iosys_map_is_null(&map[i]))

			continue;

		drm_gem_vunmap_unlocked(obj, &map[i]);

		drm_gem_vunmap(obj, &map[i]);

	}

}

EXPORT_SYMBOL(drm_gem_fb_vunmap);

drivers/gpu/drm/drm_internal.h

+2 −2
Original line number Diff line number Diff line
@@ -179,8 +179,8 @@ int drm_gem_pin_locked(struct drm_gem_object *obj); 
void drm_gem_unpin_locked(struct drm_gem_object *obj);

int drm_gem_pin(struct drm_gem_object *obj);

void drm_gem_unpin(struct drm_gem_object *obj);

int drm_gem_vmap(struct drm_gem_object *obj, struct iosys_map *map);

void drm_gem_vunmap(struct drm_gem_object *obj, struct iosys_map *map);

int drm_gem_vmap_locked(struct drm_gem_object *obj, struct iosys_map *map);

void drm_gem_vunmap_locked(struct drm_gem_object *obj, struct iosys_map *map);



/* drm_debugfs.c drm_debugfs_crc.c */

#if defined(CONFIG_DEBUG_FS)

drivers/gpu/drm/drm_prime.c

+2 −2
Original line number Diff line number Diff line
@@ -707,7 +707,7 @@ int drm_gem_dmabuf_vmap(struct dma_buf *dma_buf, struct iosys_map *map) 
{

	struct drm_gem_object *obj = dma_buf->priv;



	return drm_gem_vmap(obj, map);

	return drm_gem_vmap_locked(obj, map);

}

EXPORT_SYMBOL(drm_gem_dmabuf_vmap);
@@ -723,7 +723,7 @@ void drm_gem_dmabuf_vunmap(struct dma_buf *dma_buf, struct iosys_map *map) 
{

	struct drm_gem_object *obj = dma_buf->priv;



	drm_gem_vunmap(obj, map);

	drm_gem_vunmap_locked(obj, map);

}

EXPORT_SYMBOL(drm_gem_dmabuf_vunmap);