public-mirrors/linux
1
0
Fork 0
mirror of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-08-05 16:54:27 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source 
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: Maxime Ripard <mripard@kernel.org>
Reviewed-by: Boris Brezillon <boris.brezillon@collabora.com>
Suggested-by: Boris Brezillon <boris.brezillon@collabora.com>
Reviewed-by: Christian König <christian.koenig@amd.com>
Acked-by: Thomas Zimmermann <tzimmermann@suse.d>
Signed-off-by: Dmitry Osipenko <dmitry.osipenko@collabora.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20250322212608.40511-2-dmitry.osipenko@collabora.com
This commit is contained in:
Dmitry Osipenko 2025-03-23 00:25:59 +03:00
parent 2f9d51740c
commit 8f5c4871a0
11 changed files with 35 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
drivers/gpu/drm/drm_client.c
View file

@ -174,7 +174,7 @@ EXPORT_SYMBOL(drm_client_release);
static void drm_client_buffer_delete(struct drm_client_buffer *buffer) static void drm_client_buffer_delete(struct drm_client_buffer *buffer)
{ {
if (buffer->gem) { if (buffer->gem) {
drm_gem_vunmap_unlocked(buffer->gem, &buffer->map); drm_gem_vunmap(buffer->gem, &buffer->map);
drm_gem_object_put(buffer->gem); 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); drm_gem_lock(gem);
ret = drm_gem_vmap(gem, map); ret = drm_gem_vmap_locked(gem, map);
if (ret) if (ret)
goto err_drm_gem_vmap_unlocked; goto err_drm_gem_vmap_unlocked;
*map_copy = *map; *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 drm_gem_object *gem = buffer->gem;
struct iosys_map *map = &buffer->map; struct iosys_map *map = &buffer->map;
drm_gem_vunmap(gem, map); drm_gem_vunmap_locked(gem, map);
drm_gem_unlock(gem); drm_gem_unlock(gem);
} }
EXPORT_SYMBOL(drm_client_buffer_vunmap_local); 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); ret = drm_gem_pin_locked(gem);
if (ret) if (ret)
goto err_drm_gem_pin_locked; goto err_drm_gem_pin_locked;
ret = drm_gem_vmap(gem, map); ret = drm_gem_vmap_locked(gem, map);
if (ret) if (ret)
goto err_drm_gem_vmap; 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; struct iosys_map *map = &buffer->map;
drm_gem_lock(gem); drm_gem_lock(gem);
drm_gem_vunmap(gem, map); drm_gem_vunmap_locked(gem, map);
drm_gem_unpin_locked(gem); drm_gem_unpin_locked(gem);
drm_gem_unlock(gem); drm_gem_unlock(gem);
} }

20
drivers/gpu/drm/drm_gem.c
View file

@ -1216,7 +1216,7 @@ void drm_gem_unpin(struct drm_gem_object *obj)
dma_resv_unlock(obj->resv); 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; int ret;
@ -1233,9 +1233,9 @@ int drm_gem_vmap(struct drm_gem_object *obj, struct iosys_map *map)
return 0; 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); 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. */ /* Always set the mapping to NULL. Callers may rely on this. */
iosys_map_clear(map); iosys_map_clear(map);
} }
EXPORT_SYMBOL(drm_gem_vunmap); EXPORT_SYMBOL(drm_gem_vunmap_locked);
void drm_gem_lock(struct drm_gem_object *obj) 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); 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; int ret;
dma_resv_lock(obj->resv, NULL); dma_resv_lock(obj->resv, NULL);
ret = drm_gem_vmap(obj, map); ret = drm_gem_vmap_locked(obj, map);
dma_resv_unlock(obj->resv); dma_resv_unlock(obj->resv);
return ret; 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); dma_resv_lock(obj->resv, NULL);
drm_gem_vunmap(obj, map); drm_gem_vunmap_locked(obj, map);
dma_resv_unlock(obj->resv); 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 * drm_gem_lock_reservations - Sets up the ww context and acquires

6
drivers/gpu/drm/drm_gem_framebuffer_helper.c
View file

@ -362,7 +362,7 @@ int drm_gem_fb_vmap(struct drm_framebuffer *fb, struct iosys_map *map,
ret = -EINVAL; ret = -EINVAL;
goto err_drm_gem_vunmap; goto err_drm_gem_vunmap;
} }
ret = drm_gem_vmap_unlocked(obj, &map[i]); ret = drm_gem_vmap(obj, &map[i]);
if (ret) if (ret)
goto err_drm_gem_vunmap; goto err_drm_gem_vunmap;
} }
@ -384,7 +384,7 @@ err_drm_gem_vunmap:
obj = drm_gem_fb_get_obj(fb, i); obj = drm_gem_fb_get_obj(fb, i);
if (!obj) if (!obj)
continue; continue;
drm_gem_vunmap_unlocked(obj, &map[i]); drm_gem_vunmap(obj, &map[i]);
} }
return ret; return ret;
} }
@ -411,7 +411,7 @@ void drm_gem_fb_vunmap(struct drm_framebuffer *fb, struct iosys_map *map)
continue; continue;
if (iosys_map_is_null(&map[i])) if (iosys_map_is_null(&map[i]))
continue; continue;
drm_gem_vunmap_unlocked(obj, &map[i]); drm_gem_vunmap(obj, &map[i]);
} }
} }
EXPORT_SYMBOL(drm_gem_fb_vunmap); EXPORT_SYMBOL(drm_gem_fb_vunmap);

4
drivers/gpu/drm/drm_internal.h
View file

@ -179,8 +179,8 @@ int drm_gem_pin_locked(struct drm_gem_object *obj);
void drm_gem_unpin_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); int drm_gem_pin(struct drm_gem_object *obj);
void drm_gem_unpin(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); int drm_gem_vmap_locked(struct drm_gem_object *obj, struct iosys_map *map);
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);
/* drm_debugfs.c drm_debugfs_crc.c */ /* drm_debugfs.c drm_debugfs_crc.c */
#if defined(CONFIG_DEBUG_FS) #if defined(CONFIG_DEBUG_FS)

4
drivers/gpu/drm/drm_prime.c
View file

@ -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; 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); 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; 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); EXPORT_SYMBOL(drm_gem_dmabuf_vunmap);

4
drivers/gpu/drm/lima/lima_sched.c
View file

@ -371,7 +371,7 @@ static void lima_sched_build_error_task_list(struct lima_sched_task *task)
} else { } else {
buffer_chunk->size = lima_bo_size(bo); buffer_chunk->size = lima_bo_size(bo);
ret = drm_gem_vmap_unlocked(&bo->base.base, &map); ret = drm_gem_vmap(&bo->base.base, &map);
if (ret) { if (ret) {
kvfree(et); kvfree(et);
goto out; goto out;
@ -379,7 +379,7 @@ static void lima_sched_build_error_task_list(struct lima_sched_task *task)
memcpy(buffer_chunk + 1, map.vaddr, buffer_chunk->size); memcpy(buffer_chunk + 1, map.vaddr, buffer_chunk->size);
drm_gem_vunmap_unlocked(&bo->base.base, &map); drm_gem_vunmap(&bo->base.base, &map);
} }
buffer_chunk = (void *)(buffer_chunk + 1) + buffer_chunk->size; buffer_chunk = (void *)(buffer_chunk + 1) + buffer_chunk->size;

4
drivers/gpu/drm/panfrost/panfrost_dump.c
View file

@ -209,7 +209,7 @@ void panfrost_core_dump(struct panfrost_job *job)
goto dump_header; goto dump_header;
} }
ret = drm_gem_vmap_unlocked(&bo->base.base, &map); ret = drm_gem_vmap(&bo->base.base, &map);
if (ret) { if (ret) {
dev_err(pfdev->dev, "Panfrost Dump: couldn't map Buffer Object\n"); dev_err(pfdev->dev, "Panfrost Dump: couldn't map Buffer Object\n");
iter.hdr->bomap.valid = 0; iter.hdr->bomap.valid = 0;
@ -228,7 +228,7 @@ void panfrost_core_dump(struct panfrost_job *job)
vaddr = map.vaddr; vaddr = map.vaddr;
memcpy(iter.data, vaddr, bo->base.base.size); memcpy(iter.data, vaddr, bo->base.base.size);
drm_gem_vunmap_unlocked(&bo->base.base, &map); drm_gem_vunmap(&bo->base.base, &map);
iter.hdr->bomap.valid = 1; iter.hdr->bomap.valid = 1;

6
drivers/gpu/drm/panfrost/panfrost_perfcnt.c
View file

@ -106,7 +106,7 @@ static int panfrost_perfcnt_enable_locked(struct panfrost_device *pfdev,
goto err_close_bo; goto err_close_bo;
} }
ret = drm_gem_vmap_unlocked(&bo->base, &map); ret = drm_gem_vmap(&bo->base, &map);
if (ret) if (ret)
goto err_put_mapping; goto err_put_mapping;
perfcnt->buf = map.vaddr; perfcnt->buf = map.vaddr;
@ -165,7 +165,7 @@ static int panfrost_perfcnt_enable_locked(struct panfrost_device *pfdev,
return 0; return 0;
err_vunmap: err_vunmap:
drm_gem_vunmap_unlocked(&bo->base, &map); drm_gem_vunmap(&bo->base, &map);
err_put_mapping: err_put_mapping:
panfrost_gem_mapping_put(perfcnt->mapping); panfrost_gem_mapping_put(perfcnt->mapping);
err_close_bo: err_close_bo:
@ -195,7 +195,7 @@ static int panfrost_perfcnt_disable_locked(struct panfrost_device *pfdev,
GPU_PERFCNT_CFG_MODE(GPU_PERFCNT_CFG_MODE_OFF)); GPU_PERFCNT_CFG_MODE(GPU_PERFCNT_CFG_MODE_OFF));
perfcnt->user = NULL; perfcnt->user = NULL;
drm_gem_vunmap_unlocked(&perfcnt->mapping->obj->base.base, &map); drm_gem_vunmap(&perfcnt->mapping->obj->base.base, &map);
perfcnt->buf = NULL; perfcnt->buf = NULL;
panfrost_gem_close(&perfcnt->mapping->obj->base.base, file_priv); panfrost_gem_close(&perfcnt->mapping->obj->base.base, file_priv);
panfrost_mmu_as_put(pfdev, perfcnt->mapping->mmu); panfrost_mmu_as_put(pfdev, perfcnt->mapping->mmu);

4
drivers/gpu/drm/panthor/panthor_gem.h
View file

@ -112,7 +112,7 @@ panthor_kernel_bo_vmap(struct panthor_kernel_bo *bo)
if (bo->kmap) if (bo->kmap)
return 0; return 0;
ret = drm_gem_vmap_unlocked(bo->obj, &map); ret = drm_gem_vmap(bo->obj, &map);
if (ret) if (ret)
return ret; return ret;
@ -126,7 +126,7 @@ panthor_kernel_bo_vunmap(struct panthor_kernel_bo *bo)
if (bo->kmap) { if (bo->kmap) {
struct iosys_map map = IOSYS_MAP_INIT_VADDR(bo->kmap); struct iosys_map map = IOSYS_MAP_INIT_VADDR(bo->kmap);
drm_gem_vunmap_unlocked(bo->obj, &map); drm_gem_vunmap(bo->obj, &map);
bo->kmap = NULL; bo->kmap = NULL;
} }
} }

4
drivers/gpu/drm/panthor/panthor_sched.c
View file

@ -840,7 +840,7 @@ panthor_queue_put_syncwait_obj(struct panthor_queue *queue)
if (queue->syncwait.kmap) { if (queue->syncwait.kmap) {
struct iosys_map map = IOSYS_MAP_INIT_VADDR(queue->syncwait.kmap); struct iosys_map map = IOSYS_MAP_INIT_VADDR(queue->syncwait.kmap);
drm_gem_vunmap_unlocked(queue->syncwait.obj, &map); drm_gem_vunmap(queue->syncwait.obj, &map);
queue->syncwait.kmap = NULL; queue->syncwait.kmap = NULL;
} }
@ -866,7 +866,7 @@ panthor_queue_get_syncwait_obj(struct panthor_group *group, struct panthor_queue
goto err_put_syncwait_obj; goto err_put_syncwait_obj;
queue->syncwait.obj = &bo->base.base; queue->syncwait.obj = &bo->base.base;
ret = drm_gem_vmap_unlocked(queue->syncwait.obj, &map); ret = drm_gem_vmap(queue->syncwait.obj, &map);
if (drm_WARN_ON(&ptdev->base, ret)) if (drm_WARN_ON(&ptdev->base, ret))
goto err_put_syncwait_obj; goto err_put_syncwait_obj;

4
include/drm/drm_gem.h
View file

@ -537,8 +537,8 @@ void drm_gem_put_pages(struct drm_gem_object *obj, struct page **pages,
void drm_gem_lock(struct drm_gem_object *obj); void drm_gem_lock(struct drm_gem_object *obj);
void drm_gem_unlock(struct drm_gem_object *obj); void drm_gem_unlock(struct drm_gem_object *obj);
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);
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);
int drm_gem_objects_lookup(struct drm_file *filp, void __user *bo_handles, int drm_gem_objects_lookup(struct drm_file *filp, void __user *bo_handles,
int count, struct drm_gem_object ***objs_out); int count, struct drm_gem_object ***objs_out);