Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
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
+35
-35
+5
-5
drivers/gpu/drm/drm_client.c
+5
-5
drivers/gpu/drm/drm_client.c
···
174
174
static void drm_client_buffer_delete(struct drm_client_buffer *buffer)
175
175
{
176
176
if (buffer->gem) {
177
-
drm_gem_vunmap_unlocked(buffer->gem, &buffer->map);
177
+
drm_gem_vunmap(buffer->gem, &buffer->map);
178
178
drm_gem_object_put(buffer->gem);
179
179
}
180
180
···
252
252
253
253
drm_gem_lock(gem);
254
254
255
-
ret = drm_gem_vmap(gem, map);
255
+
ret = drm_gem_vmap_locked(gem, map);
256
256
if (ret)
257
257
goto err_drm_gem_vmap_unlocked;
258
258
*map_copy = *map;
···
278
278
struct drm_gem_object *gem = buffer->gem;
279
279
struct iosys_map *map = &buffer->map;
280
280
281
-
drm_gem_vunmap(gem, map);
281
+
drm_gem_vunmap_locked(gem, map);
282
282
drm_gem_unlock(gem);
283
283
}
284
284
EXPORT_SYMBOL(drm_client_buffer_vunmap_local);
···
316
316
ret = drm_gem_pin_locked(gem);
317
317
if (ret)
318
318
goto err_drm_gem_pin_locked;
319
-
ret = drm_gem_vmap(gem, map);
319
+
ret = drm_gem_vmap_locked(gem, map);
320
320
if (ret)
321
321
goto err_drm_gem_vmap;
322
322
···
348
348
struct iosys_map *map = &buffer->map;
349
349
350
350
drm_gem_lock(gem);
351
-
drm_gem_vunmap(gem, map);
351
+
drm_gem_vunmap_locked(gem, map);
352
352
drm_gem_unpin_locked(gem);
353
353
drm_gem_unlock(gem);
354
354
}
+10
-10
drivers/gpu/drm/drm_gem.c
+10
-10
drivers/gpu/drm/drm_gem.c
···
1216
1216
dma_resv_unlock(obj->resv);
1217
1217
}
1218
1218
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)
1220
1220
{
1221
1221
int ret;
1222
1222
···
1233
1233
1234
1234
return 0;
1235
1235
}
1236
-
EXPORT_SYMBOL(drm_gem_vmap);
1236
+
EXPORT_SYMBOL(drm_gem_vmap_locked);
1237
1237
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)
1239
1239
{
1240
1240
dma_resv_assert_held(obj->resv);
1241
1241
···
1248
1248
/* Always set the mapping to NULL. Callers may rely on this. */
1249
1249
iosys_map_clear(map);
1250
1250
}
1251
-
EXPORT_SYMBOL(drm_gem_vunmap);
1251
+
EXPORT_SYMBOL(drm_gem_vunmap_locked);
1252
1252
1253
1253
void drm_gem_lock(struct drm_gem_object *obj)
1254
1254
{
···
1262
1262
}
1263
1263
EXPORT_SYMBOL(drm_gem_unlock);
1264
1264
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)
1266
1266
{
1267
1267
int ret;
1268
1268
1269
1269
dma_resv_lock(obj->resv, NULL);
1270
-
ret = drm_gem_vmap(obj, map);
1270
+
ret = drm_gem_vmap_locked(obj, map);
1271
1271
dma_resv_unlock(obj->resv);
1272
1272
1273
1273
return ret;
1274
1274
}
1275
-
EXPORT_SYMBOL(drm_gem_vmap_unlocked);
1275
+
EXPORT_SYMBOL(drm_gem_vmap);
1276
1276
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)
1278
1278
{
1279
1279
dma_resv_lock(obj->resv, NULL);
1280
-
drm_gem_vunmap(obj, map);
1280
+
drm_gem_vunmap_locked(obj, map);
1281
1281
dma_resv_unlock(obj->resv);
1282
1282
}
1283
-
EXPORT_SYMBOL(drm_gem_vunmap_unlocked);
1283
+
EXPORT_SYMBOL(drm_gem_vunmap);
1284
1284
1285
1285
/**
1286
1286
* drm_gem_lock_reservations - Sets up the ww context and acquires
+3
-3
drivers/gpu/drm/drm_gem_framebuffer_helper.c
+3
-3
drivers/gpu/drm/drm_gem_framebuffer_helper.c
···
362
362
ret = -EINVAL;
363
363
goto err_drm_gem_vunmap;
364
364
}
365
-
ret = drm_gem_vmap_unlocked(obj, &map[i]);
365
+
ret = drm_gem_vmap(obj, &map[i]);
366
366
if (ret)
367
367
goto err_drm_gem_vunmap;
368
368
}
···
384
384
obj = drm_gem_fb_get_obj(fb, i);
385
385
if (!obj)
386
386
continue;
387
-
drm_gem_vunmap_unlocked(obj, &map[i]);
387
+
drm_gem_vunmap(obj, &map[i]);
388
388
}
389
389
return ret;
390
390
}
···
411
411
continue;
412
412
if (iosys_map_is_null(&map[i]))
413
413
continue;
414
-
drm_gem_vunmap_unlocked(obj, &map[i]);
414
+
drm_gem_vunmap(obj, &map[i]);
415
415
}
416
416
}
417
417
EXPORT_SYMBOL(drm_gem_fb_vunmap);
+2
-2
drivers/gpu/drm/drm_internal.h
+2
-2
drivers/gpu/drm/drm_internal.h
···
179
179
void drm_gem_unpin_locked(struct drm_gem_object *obj);
180
180
int drm_gem_pin(struct drm_gem_object *obj);
181
181
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);
184
184
185
185
/* drm_debugfs.c drm_debugfs_crc.c */
186
186
#if defined(CONFIG_DEBUG_FS)
+2
-2
drivers/gpu/drm/drm_prime.c
+2
-2
drivers/gpu/drm/drm_prime.c
···
707
707
{
708
708
struct drm_gem_object *obj = dma_buf->priv;
709
709
710
-
return drm_gem_vmap(obj, map);
710
+
return drm_gem_vmap_locked(obj, map);
711
711
}
712
712
EXPORT_SYMBOL(drm_gem_dmabuf_vmap);
713
713
···
723
723
{
724
724
struct drm_gem_object *obj = dma_buf->priv;
725
725
726
-
drm_gem_vunmap(obj, map);
726
+
drm_gem_vunmap_locked(obj, map);
727
727
}
728
728
EXPORT_SYMBOL(drm_gem_dmabuf_vunmap);
729
729
+2
-2
drivers/gpu/drm/lima/lima_sched.c
+2
-2
drivers/gpu/drm/lima/lima_sched.c
···
371
371
} else {
372
372
buffer_chunk->size = lima_bo_size(bo);
373
373
374
-
ret = drm_gem_vmap_unlocked(&bo->base.base, &map);
374
+
ret = drm_gem_vmap(&bo->base.base, &map);
375
375
if (ret) {
376
376
kvfree(et);
377
377
goto out;
···
379
379
380
380
memcpy(buffer_chunk + 1, map.vaddr, buffer_chunk->size);
381
381
382
-
drm_gem_vunmap_unlocked(&bo->base.base, &map);
382
+
drm_gem_vunmap(&bo->base.base, &map);
383
383
}
384
384
385
385
buffer_chunk = (void *)(buffer_chunk + 1) + buffer_chunk->size;
+2
-2
drivers/gpu/drm/panfrost/panfrost_dump.c
+2
-2
drivers/gpu/drm/panfrost/panfrost_dump.c
···
209
209
goto dump_header;
210
210
}
211
211
212
-
ret = drm_gem_vmap_unlocked(&bo->base.base, &map);
212
+
ret = drm_gem_vmap(&bo->base.base, &map);
213
213
if (ret) {
214
214
dev_err(pfdev->dev, "Panfrost Dump: couldn't map Buffer Object\n");
215
215
iter.hdr->bomap.valid = 0;
···
228
228
vaddr = map.vaddr;
229
229
memcpy(iter.data, vaddr, bo->base.base.size);
230
230
231
-
drm_gem_vunmap_unlocked(&bo->base.base, &map);
231
+
drm_gem_vunmap(&bo->base.base, &map);
232
232
233
233
iter.hdr->bomap.valid = 1;
234
234
+3
-3
drivers/gpu/drm/panfrost/panfrost_perfcnt.c
+3
-3
drivers/gpu/drm/panfrost/panfrost_perfcnt.c
···
106
106
goto err_close_bo;
107
107
}
108
108
109
-
ret = drm_gem_vmap_unlocked(&bo->base, &map);
109
+
ret = drm_gem_vmap(&bo->base, &map);
110
110
if (ret)
111
111
goto err_put_mapping;
112
112
perfcnt->buf = map.vaddr;
···
165
165
return 0;
166
166
167
167
err_vunmap:
168
-
drm_gem_vunmap_unlocked(&bo->base, &map);
168
+
drm_gem_vunmap(&bo->base, &map);
169
169
err_put_mapping:
170
170
panfrost_gem_mapping_put(perfcnt->mapping);
171
171
err_close_bo:
···
195
195
GPU_PERFCNT_CFG_MODE(GPU_PERFCNT_CFG_MODE_OFF));
196
196
197
197
perfcnt->user = NULL;
198
-
drm_gem_vunmap_unlocked(&perfcnt->mapping->obj->base.base, &map);
198
+
drm_gem_vunmap(&perfcnt->mapping->obj->base.base, &map);
199
199
perfcnt->buf = NULL;
200
200
panfrost_gem_close(&perfcnt->mapping->obj->base.base, file_priv);
201
201
panfrost_mmu_as_put(pfdev, perfcnt->mapping->mmu);
+2
-2
drivers/gpu/drm/panthor/panthor_gem.h
+2
-2
drivers/gpu/drm/panthor/panthor_gem.h
···
112
112
if (bo->kmap)
113
113
return 0;
114
114
115
-
ret = drm_gem_vmap_unlocked(bo->obj, &map);
115
+
ret = drm_gem_vmap(bo->obj, &map);
116
116
if (ret)
117
117
return ret;
118
118
···
126
126
if (bo->kmap) {
127
127
struct iosys_map map = IOSYS_MAP_INIT_VADDR(bo->kmap);
128
128
129
-
drm_gem_vunmap_unlocked(bo->obj, &map);
129
+
drm_gem_vunmap(bo->obj, &map);
130
130
bo->kmap = NULL;
131
131
}
132
132
}
+2
-2
drivers/gpu/drm/panthor/panthor_sched.c
+2
-2
drivers/gpu/drm/panthor/panthor_sched.c
···
840
840
if (queue->syncwait.kmap) {
841
841
struct iosys_map map = IOSYS_MAP_INIT_VADDR(queue->syncwait.kmap);
842
842
843
-
drm_gem_vunmap_unlocked(queue->syncwait.obj, &map);
843
+
drm_gem_vunmap(queue->syncwait.obj, &map);
844
844
queue->syncwait.kmap = NULL;
845
845
}
846
846
···
866
866
goto err_put_syncwait_obj;
867
867
868
868
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);
870
870
if (drm_WARN_ON(&ptdev->base, ret))
871
871
goto err_put_syncwait_obj;
872
872
+2
-2
include/drm/drm_gem.h
+2
-2
include/drm/drm_gem.h
···
537
537
void drm_gem_lock(struct drm_gem_object *obj);
538
538
void drm_gem_unlock(struct drm_gem_object *obj);
539
539
540
-
int drm_gem_vmap_unlocked(struct drm_gem_object *obj, struct iosys_map *map);
541
-
void drm_gem_vunmap_unlocked(struct drm_gem_object *obj, struct iosys_map *map);
540
+
int drm_gem_vmap(struct drm_gem_object *obj, struct iosys_map *map);
541
+
void drm_gem_vunmap(struct drm_gem_object *obj, struct iosys_map *map);
542
542
543
543
int drm_gem_objects_lookup(struct drm_file *filp, void __user *bo_handles,
544
544
int count, struct drm_gem_object ***objs_out);