Skip to content

Commit 8f5c487

Browse files
digetxdigetx
committed
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: 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
1 parent 2f9d517 commit 8f5c487

File tree

11 files changed

+35
-35
lines changed

11 files changed

+35
-35
lines changed

‎drivers/gpu/drm/drm_client.c‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -174,7 +174,7 @@ EXPORT_SYMBOL(drm_client_release);
174174
static void drm_client_buffer_delete(struct drm_client_buffer *buffer)
175175
{
176176
if (buffer->gem) {
177-
drm_gem_vunmap_unlocked(buffer->gem, &buffer->map);
177+
drm_gem_vunmap(buffer->gem, &buffer->map);
178178
drm_gem_object_put(buffer->gem);
179179
}
180180

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

253253
drm_gem_lock(gem);
254254

255-
ret = drm_gem_vmap(gem, map);
255+
ret = drm_gem_vmap_locked(gem, map);
256256
if (ret)
257257
goto err_drm_gem_vmap_unlocked;
258258
*map_copy = *map;
@@ -278,7 +278,7 @@ void drm_client_buffer_vunmap_local(struct drm_client_buffer *buffer)
278278
struct drm_gem_object *gem = buffer->gem;
279279
struct iosys_map *map = &buffer->map;
280280

281-
drm_gem_vunmap(gem, map);
281+
drm_gem_vunmap_locked(gem, map);
282282
drm_gem_unlock(gem);
283283
}
284284
EXPORT_SYMBOL(drm_client_buffer_vunmap_local);
@@ -316,7 +316,7 @@ drm_client_buffer_vmap(struct drm_client_buffer *buffer,
316316
ret = drm_gem_pin_locked(gem);
317317
if (ret)
318318
goto err_drm_gem_pin_locked;
319-
ret = drm_gem_vmap(gem, map);
319+
ret = drm_gem_vmap_locked(gem, map);
320320
if (ret)
321321
goto err_drm_gem_vmap;
322322

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

350350
drm_gem_lock(gem);
351-
drm_gem_vunmap(gem, map);
351+
drm_gem_vunmap_locked(gem, map);
352352
drm_gem_unpin_locked(gem);
353353
drm_gem_unlock(gem);
354354
}

‎drivers/gpu/drm/drm_gem.c‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1216,7 +1216,7 @@ void drm_gem_unpin(struct drm_gem_object *obj)
12161216
dma_resv_unlock(obj->resv);
12171217
}
12181218

1219-
int drm_gem_vmap(struct drm_gem_object *obj, struct iosys_map *map)
1219+
int drm_gem_vmap_locked(struct drm_gem_object *obj, struct iosys_map *map)
12201220
{
12211221
int ret;
12221222

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

12341234
return 0;
12351235
}
1236-
EXPORT_SYMBOL(drm_gem_vmap);
1236+
EXPORT_SYMBOL(drm_gem_vmap_locked);
12371237

1238-
void drm_gem_vunmap(struct drm_gem_object *obj, struct iosys_map *map)
1238+
void drm_gem_vunmap_locked(struct drm_gem_object *obj, struct iosys_map *map)
12391239
{
12401240
dma_resv_assert_held(obj->resv);
12411241

@@ -1248,7 +1248,7 @@ void drm_gem_vunmap(struct drm_gem_object *obj, struct iosys_map *map)
12481248
/* Always set the mapping to NULL. Callers may rely on this. */
12491249
iosys_map_clear(map);
12501250
}
1251-
EXPORT_SYMBOL(drm_gem_vunmap);
1251+
EXPORT_SYMBOL(drm_gem_vunmap_locked);
12521252

12531253
void drm_gem_lock(struct drm_gem_object *obj)
12541254
{
@@ -1262,25 +1262,25 @@ void drm_gem_unlock(struct drm_gem_object *obj)
12621262
}
12631263
EXPORT_SYMBOL(drm_gem_unlock);
12641264

1265-
int drm_gem_vmap_unlocked(struct drm_gem_object *obj, struct iosys_map *map)
1265+
int drm_gem_vmap(struct drm_gem_object *obj, struct iosys_map *map)
12661266
{
12671267
int ret;
12681268

12691269
dma_resv_lock(obj->resv, NULL);
1270-
ret = drm_gem_vmap(obj, map);
1270+
ret = drm_gem_vmap_locked(obj, map);
12711271
dma_resv_unlock(obj->resv);
12721272

12731273
return ret;
12741274
}
1275-
EXPORT_SYMBOL(drm_gem_vmap_unlocked);
1275+
EXPORT_SYMBOL(drm_gem_vmap);
12761276

1277-
void drm_gem_vunmap_unlocked(struct drm_gem_object *obj, struct iosys_map *map)
1277+
void drm_gem_vunmap(struct drm_gem_object *obj, struct iosys_map *map)
12781278
{
12791279
dma_resv_lock(obj->resv, NULL);
1280-
drm_gem_vunmap(obj, map);
1280+
drm_gem_vunmap_locked(obj, map);
12811281
dma_resv_unlock(obj->resv);
12821282
}
1283-
EXPORT_SYMBOL(drm_gem_vunmap_unlocked);
1283+
EXPORT_SYMBOL(drm_gem_vunmap);
12841284

12851285
/**
12861286
* drm_gem_lock_reservations - Sets up the ww context and acquires

‎drivers/gpu/drm/drm_gem_framebuffer_helper.c‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -362,7 +362,7 @@ int drm_gem_fb_vmap(struct drm_framebuffer *fb, struct iosys_map *map,
362362
ret = -EINVAL;
363363
goto err_drm_gem_vunmap;
364364
}
365-
ret = drm_gem_vmap_unlocked(obj, &map[i]);
365+
ret = drm_gem_vmap(obj, &map[i]);
366366
if (ret)
367367
goto err_drm_gem_vunmap;
368368
}
@@ -384,7 +384,7 @@ int drm_gem_fb_vmap(struct drm_framebuffer *fb, struct iosys_map *map,
384384
obj = drm_gem_fb_get_obj(fb, i);
385385
if (!obj)
386386
continue;
387-
drm_gem_vunmap_unlocked(obj, &map[i]);
387+
drm_gem_vunmap(obj, &map[i]);
388388
}
389389
return ret;
390390
}
@@ -411,7 +411,7 @@ void drm_gem_fb_vunmap(struct drm_framebuffer *fb, struct iosys_map *map)
411411
continue;
412412
if (iosys_map_is_null(&map[i]))
413413
continue;
414-
drm_gem_vunmap_unlocked(obj, &map[i]);
414+
drm_gem_vunmap(obj, &map[i]);
415415
}
416416
}
417417
EXPORT_SYMBOL(drm_gem_fb_vunmap);

‎drivers/gpu/drm/drm_internal.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -179,8 +179,8 @@ int drm_gem_pin_locked(struct drm_gem_object *obj);
179179
void drm_gem_unpin_locked(struct drm_gem_object *obj);
180180
int drm_gem_pin(struct drm_gem_object *obj);
181181
void drm_gem_unpin(struct drm_gem_object *obj);
182-
int drm_gem_vmap(struct drm_gem_object *obj, struct iosys_map *map);
183-
void drm_gem_vunmap(struct drm_gem_object *obj, struct iosys_map *map);
182+
int drm_gem_vmap_locked(struct drm_gem_object *obj, struct iosys_map *map);
183+
void drm_gem_vunmap_locked(struct drm_gem_object *obj, struct iosys_map *map);
184184

185185
/* drm_debugfs.c drm_debugfs_crc.c */
186186
#if defined(CONFIG_DEBUG_FS)

‎drivers/gpu/drm/drm_prime.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -707,7 +707,7 @@ int drm_gem_dmabuf_vmap(struct dma_buf *dma_buf, struct iosys_map *map)
707707
{
708708
struct drm_gem_object *obj = dma_buf->priv;
709709

710-
return drm_gem_vmap(obj, map);
710+
return drm_gem_vmap_locked(obj, map);
711711
}
712712
EXPORT_SYMBOL(drm_gem_dmabuf_vmap);
713713

@@ -723,7 +723,7 @@ void drm_gem_dmabuf_vunmap(struct dma_buf *dma_buf, struct iosys_map *map)
723723
{
724724
struct drm_gem_object *obj = dma_buf->priv;
725725

726-
drm_gem_vunmap(obj, map);
726+
drm_gem_vunmap_locked(obj, map);
727727
}
728728
EXPORT_SYMBOL(drm_gem_dmabuf_vunmap);
729729

‎drivers/gpu/drm/lima/lima_sched.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -371,15 +371,15 @@ static void lima_sched_build_error_task_list(struct lima_sched_task *task)
371371
} else {
372372
buffer_chunk->size = lima_bo_size(bo);
373373

374-
ret = drm_gem_vmap_unlocked(&bo->base.base, &map);
374+
ret = drm_gem_vmap(&bo->base.base, &map);
375375
if (ret) {
376376
kvfree(et);
377377
goto out;
378378
}
379379

380380
memcpy(buffer_chunk + 1, map.vaddr, buffer_chunk->size);
381381

382-
drm_gem_vunmap_unlocked(&bo->base.base, &map);
382+
drm_gem_vunmap(&bo->base.base, &map);
383383
}
384384

385385
buffer_chunk = (void *)(buffer_chunk + 1) + buffer_chunk->size;

‎drivers/gpu/drm/panfrost/panfrost_dump.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -209,7 +209,7 @@ void panfrost_core_dump(struct panfrost_job *job)
209209
goto dump_header;
210210
}
211211

212-
ret = drm_gem_vmap_unlocked(&bo->base.base, &map);
212+
ret = drm_gem_vmap(&bo->base.base, &map);
213213
if (ret) {
214214
dev_err(pfdev->dev, "Panfrost Dump: couldn't map Buffer Object\n");
215215
iter.hdr->bomap.valid = 0;
@@ -228,7 +228,7 @@ void panfrost_core_dump(struct panfrost_job *job)
228228
vaddr = map.vaddr;
229229
memcpy(iter.data, vaddr, bo->base.base.size);
230230

231-
drm_gem_vunmap_unlocked(&bo->base.base, &map);
231+
drm_gem_vunmap(&bo->base.base, &map);
232232

233233
iter.hdr->bomap.valid = 1;
234234

‎drivers/gpu/drm/panfrost/panfrost_perfcnt.c‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ static int panfrost_perfcnt_enable_locked(struct panfrost_device *pfdev,
106106
goto err_close_bo;
107107
}
108108

109-
ret = drm_gem_vmap_unlocked(&bo->base, &map);
109+
ret = drm_gem_vmap(&bo->base, &map);
110110
if (ret)
111111
goto err_put_mapping;
112112
perfcnt->buf = map.vaddr;
@@ -165,7 +165,7 @@ static int panfrost_perfcnt_enable_locked(struct panfrost_device *pfdev,
165165
return 0;
166166

167167
err_vunmap:
168-
drm_gem_vunmap_unlocked(&bo->base, &map);
168+
drm_gem_vunmap(&bo->base, &map);
169169
err_put_mapping:
170170
panfrost_gem_mapping_put(perfcnt->mapping);
171171
err_close_bo:
@@ -195,7 +195,7 @@ static int panfrost_perfcnt_disable_locked(struct panfrost_device *pfdev,
195195
GPU_PERFCNT_CFG_MODE(GPU_PERFCNT_CFG_MODE_OFF));
196196

197197
perfcnt->user = NULL;
198-
drm_gem_vunmap_unlocked(&perfcnt->mapping->obj->base.base, &map);
198+
drm_gem_vunmap(&perfcnt->mapping->obj->base.base, &map);
199199
perfcnt->buf = NULL;
200200
panfrost_gem_close(&perfcnt->mapping->obj->base.base, file_priv);
201201
panfrost_mmu_as_put(pfdev, perfcnt->mapping->mmu);

‎drivers/gpu/drm/panthor/panthor_gem.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ panthor_kernel_bo_vmap(struct panthor_kernel_bo *bo)
112112
if (bo->kmap)
113113
return 0;
114114

115-
ret = drm_gem_vmap_unlocked(bo->obj, &map);
115+
ret = drm_gem_vmap(bo->obj, &map);
116116
if (ret)
117117
return ret;
118118

@@ -126,7 +126,7 @@ panthor_kernel_bo_vunmap(struct panthor_kernel_bo *bo)
126126
if (bo->kmap) {
127127
struct iosys_map map = IOSYS_MAP_INIT_VADDR(bo->kmap);
128128

129-
drm_gem_vunmap_unlocked(bo->obj, &map);
129+
drm_gem_vunmap(bo->obj, &map);
130130
bo->kmap = NULL;
131131
}
132132
}

‎drivers/gpu/drm/panthor/panthor_sched.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -840,7 +840,7 @@ panthor_queue_put_syncwait_obj(struct panthor_queue *queue)
840840
if (queue->syncwait.kmap) {
841841
struct iosys_map map = IOSYS_MAP_INIT_VADDR(queue->syncwait.kmap);
842842

843-
drm_gem_vunmap_unlocked(queue->syncwait.obj, &map);
843+
drm_gem_vunmap(queue->syncwait.obj, &map);
844844
queue->syncwait.kmap = NULL;
845845
}
846846

@@ -866,7 +866,7 @@ panthor_queue_get_syncwait_obj(struct panthor_group *group, struct panthor_queue
866866
goto err_put_syncwait_obj;
867867

868868
queue->syncwait.obj = &bo->base.base;
869-
ret = drm_gem_vmap_unlocked(queue->syncwait.obj, &map);
869+
ret = drm_gem_vmap(queue->syncwait.obj, &map);
870870
if (drm_WARN_ON(&ptdev->base, ret))
871871
goto err_put_syncwait_obj;
872872

0 commit comments

Comments
 (0)