Skip to content

Commit 030af2b

Browse files
robclarkrobclark
committed
drm/msm: drop drm_gem_object_put_locked()
No idea why we were still using this. It certainly hasn't been needed for some time. So drop the pointless twin codepaths. Signed-off-by: Rob Clark <[email protected]> Acked-by: Christian König <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Rob Clark <[email protected]>
1 parent 86c2a0f commit 030af2b

File tree

13 files changed

+33
-77
lines changed

13 files changed

+33
-77
lines changed

‎drivers/gpu/drm/msm/adreno/a5xx_debugfs.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -117,13 +117,13 @@ reset_set(void *data, u64 val)
117117

118118
if (a5xx_gpu->pm4_bo) {
119119
msm_gem_unpin_iova(a5xx_gpu->pm4_bo, gpu->aspace);
120-
drm_gem_object_put_locked(a5xx_gpu->pm4_bo);
120+
drm_gem_object_put(a5xx_gpu->pm4_bo);
121121
a5xx_gpu->pm4_bo = NULL;
122122
}
123123

124124
if (a5xx_gpu->pfp_bo) {
125125
msm_gem_unpin_iova(a5xx_gpu->pfp_bo, gpu->aspace);
126-
drm_gem_object_put_locked(a5xx_gpu->pfp_bo);
126+
drm_gem_object_put(a5xx_gpu->pfp_bo);
127127
a5xx_gpu->pfp_bo = NULL;
128128
}
129129

‎drivers/gpu/drm/msm/adreno/a5xx_gpu.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1415,7 +1415,7 @@ struct a5xx_gpu_state {
14151415
static int a5xx_crashdumper_init(struct msm_gpu *gpu,
14161416
struct a5xx_crashdumper *dumper)
14171417
{
1418-
dumper->ptr = msm_gem_kernel_new_locked(gpu->dev,
1418+
dumper->ptr = msm_gem_kernel_new(gpu->dev,
14191419
SZ_1M, MSM_BO_WC, gpu->aspace,
14201420
&dumper->bo, &dumper->iova);
14211421

@@ -1517,15 +1517,15 @@ static void a5xx_gpu_state_get_hlsq_regs(struct msm_gpu *gpu,
15171517

15181518
if (a5xx_crashdumper_run(gpu, &dumper)) {
15191519
kfree(a5xx_state->hlsqregs);
1520-
msm_gem_kernel_put(dumper.bo, gpu->aspace, true);
1520+
msm_gem_kernel_put(dumper.bo, gpu->aspace);
15211521
return;
15221522
}
15231523

15241524
/* Copy the data from the crashdumper to the state */
15251525
memcpy(a5xx_state->hlsqregs, dumper.ptr + (256 * SZ_1K),
15261526
count * sizeof(u32));
15271527

1528-
msm_gem_kernel_put(dumper.bo, gpu->aspace, true);
1528+
msm_gem_kernel_put(dumper.bo, gpu->aspace);
15291529
}
15301530

15311531
static struct msm_gpu_state *a5xx_gpu_state_get(struct msm_gpu *gpu)

‎drivers/gpu/drm/msm/adreno/a5xx_power.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -362,7 +362,7 @@ void a5xx_gpmu_ucode_init(struct msm_gpu *gpu)
362362
*/
363363
bosize = (cmds_size + (cmds_size / TYPE4_MAX_PAYLOAD) + 1) << 2;
364364

365-
ptr = msm_gem_kernel_new_locked(drm, bosize,
365+
ptr = msm_gem_kernel_new(drm, bosize,
366366
MSM_BO_WC | MSM_BO_GPU_READONLY, gpu->aspace,
367367
&a5xx_gpu->gpmu_bo, &a5xx_gpu->gpmu_iova);
368368
if (IS_ERR(ptr))

‎drivers/gpu/drm/msm/adreno/a5xx_preempt.c

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -240,7 +240,7 @@ static int preempt_init_ring(struct a5xx_gpu *a5xx_gpu,
240240
A5XX_PREEMPT_COUNTER_SIZE,
241241
MSM_BO_WC, gpu->aspace, &counters_bo, &counters_iova);
242242
if (IS_ERR(counters)) {
243-
msm_gem_kernel_put(bo, gpu->aspace, true);
243+
msm_gem_kernel_put(bo, gpu->aspace);
244244
return PTR_ERR(counters);
245245
}
246246

@@ -272,9 +272,8 @@ void a5xx_preempt_fini(struct msm_gpu *gpu)
272272
int i;
273273

274274
for (i = 0; i < gpu->nr_rings; i++) {
275-
msm_gem_kernel_put(a5xx_gpu->preempt_bo[i], gpu->aspace, true);
276-
msm_gem_kernel_put(a5xx_gpu->preempt_counters_bo[i],
277-
gpu->aspace, true);
275+
msm_gem_kernel_put(a5xx_gpu->preempt_bo[i], gpu->aspace);
276+
msm_gem_kernel_put(a5xx_gpu->preempt_counters_bo[i], gpu->aspace);
278277
}
279278
}
280279

‎drivers/gpu/drm/msm/adreno/a6xx_gmu.c

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1129,12 +1129,12 @@ int a6xx_gmu_stop(struct a6xx_gpu *a6xx_gpu)
11291129

11301130
static void a6xx_gmu_memory_free(struct a6xx_gmu *gmu)
11311131
{
1132-
msm_gem_kernel_put(gmu->hfi.obj, gmu->aspace, false);
1133-
msm_gem_kernel_put(gmu->debug.obj, gmu->aspace, false);
1134-
msm_gem_kernel_put(gmu->icache.obj, gmu->aspace, false);
1135-
msm_gem_kernel_put(gmu->dcache.obj, gmu->aspace, false);
1136-
msm_gem_kernel_put(gmu->dummy.obj, gmu->aspace, false);
1137-
msm_gem_kernel_put(gmu->log.obj, gmu->aspace, false);
1132+
msm_gem_kernel_put(gmu->hfi.obj, gmu->aspace);
1133+
msm_gem_kernel_put(gmu->debug.obj, gmu->aspace);
1134+
msm_gem_kernel_put(gmu->icache.obj, gmu->aspace);
1135+
msm_gem_kernel_put(gmu->dcache.obj, gmu->aspace);
1136+
msm_gem_kernel_put(gmu->dummy.obj, gmu->aspace);
1137+
msm_gem_kernel_put(gmu->log.obj, gmu->aspace);
11381138

11391139
gmu->aspace->mmu->funcs->detach(gmu->aspace->mmu);
11401140
msm_gem_address_space_put(gmu->aspace);

‎drivers/gpu/drm/msm/adreno/a6xx_gpu.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1035,7 +1035,7 @@ static int a6xx_hw_init(struct msm_gpu *gpu)
10351035

10361036
if (adreno_gpu->base.hw_apriv || a6xx_gpu->has_whereami) {
10371037
if (!a6xx_gpu->shadow_bo) {
1038-
a6xx_gpu->shadow = msm_gem_kernel_new_locked(gpu->dev,
1038+
a6xx_gpu->shadow = msm_gem_kernel_new(gpu->dev,
10391039
sizeof(u32) * gpu->nr_rings,
10401040
MSM_BO_WC | MSM_BO_MAP_PRIV,
10411041
gpu->aspace, &a6xx_gpu->shadow_bo,

‎drivers/gpu/drm/msm/adreno/a6xx_gpu_state.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ static void *state_kmemdup(struct a6xx_gpu_state *a6xx_state, void *src,
112112
static int a6xx_crashdumper_init(struct msm_gpu *gpu,
113113
struct a6xx_crashdumper *dumper)
114114
{
115-
dumper->ptr = msm_gem_kernel_new_locked(gpu->dev,
115+
dumper->ptr = msm_gem_kernel_new(gpu->dev,
116116
SZ_1M, MSM_BO_WC, gpu->aspace,
117117
&dumper->bo, &dumper->iova);
118118

@@ -961,7 +961,7 @@ struct msm_gpu_state *a6xx_gpu_state_get(struct msm_gpu *gpu)
961961
a6xx_get_clusters(gpu, a6xx_state, dumper);
962962
a6xx_get_dbgahb_clusters(gpu, a6xx_state, dumper);
963963

964-
msm_gem_kernel_put(dumper->bo, gpu->aspace, true);
964+
msm_gem_kernel_put(dumper->bo, gpu->aspace);
965965
}
966966

967967
if (snapshot_debugbus)

‎drivers/gpu/drm/msm/adreno/adreno_gpu.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -390,7 +390,7 @@ struct drm_gem_object *adreno_fw_create_bo(struct msm_gpu *gpu,
390390
struct drm_gem_object *bo;
391391
void *ptr;
392392

393-
ptr = msm_gem_kernel_new_locked(gpu->dev, fw->size - 4,
393+
ptr = msm_gem_kernel_new(gpu->dev, fw->size - 4,
394394
MSM_BO_WC | MSM_BO_GPU_READONLY, gpu->aspace, &bo, iova);
395395

396396
if (IS_ERR(ptr))

‎drivers/gpu/drm/msm/msm_gem.c

Lines changed: 9 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -1062,7 +1062,7 @@ void msm_gem_describe_objects(struct list_head *list, struct seq_file *m)
10621062
}
10631063
#endif
10641064

1065-
/* don't call directly! Use drm_gem_object_put_locked() and friends */
1065+
/* don't call directly! Use drm_gem_object_put() */
10661066
void msm_gem_free_object(struct drm_gem_object *obj)
10671067
{
10681068
struct msm_gem_object *msm_obj = to_msm_bo(obj);
@@ -1192,8 +1192,7 @@ static int msm_gem_new_impl(struct drm_device *dev,
11921192
return 0;
11931193
}
11941194

1195-
static struct drm_gem_object *_msm_gem_new(struct drm_device *dev,
1196-
uint32_t size, uint32_t flags, bool struct_mutex_locked)
1195+
struct drm_gem_object *msm_gem_new(struct drm_device *dev, uint32_t size, uint32_t flags)
11971196
{
11981197
struct msm_drm_private *priv = dev->dev_private;
11991198
struct msm_gem_object *msm_obj;
@@ -1280,26 +1279,10 @@ static struct drm_gem_object *_msm_gem_new(struct drm_device *dev,
12801279
return obj;
12811280

12821281
fail:
1283-
if (struct_mutex_locked) {
1284-
drm_gem_object_put_locked(obj);
1285-
} else {
1286-
drm_gem_object_put(obj);
1287-
}
1282+
drm_gem_object_put(obj);
12881283
return ERR_PTR(ret);
12891284
}
12901285

1291-
struct drm_gem_object *msm_gem_new_locked(struct drm_device *dev,
1292-
uint32_t size, uint32_t flags)
1293-
{
1294-
return _msm_gem_new(dev, size, flags, true);
1295-
}
1296-
1297-
struct drm_gem_object *msm_gem_new(struct drm_device *dev,
1298-
uint32_t size, uint32_t flags)
1299-
{
1300-
return _msm_gem_new(dev, size, flags, false);
1301-
}
1302-
13031286
struct drm_gem_object *msm_gem_import(struct drm_device *dev,
13041287
struct dma_buf *dmabuf, struct sg_table *sgt)
13051288
{
@@ -1358,12 +1341,12 @@ struct drm_gem_object *msm_gem_import(struct drm_device *dev,
13581341
return ERR_PTR(ret);
13591342
}
13601343

1361-
static void *_msm_gem_kernel_new(struct drm_device *dev, uint32_t size,
1344+
void *msm_gem_kernel_new(struct drm_device *dev, uint32_t size,
13621345
uint32_t flags, struct msm_gem_address_space *aspace,
1363-
struct drm_gem_object **bo, uint64_t *iova, bool locked)
1346+
struct drm_gem_object **bo, uint64_t *iova)
13641347
{
13651348
void *vaddr;
1366-
struct drm_gem_object *obj = _msm_gem_new(dev, size, flags, locked);
1349+
struct drm_gem_object *obj = msm_gem_new(dev, size, flags);
13671350
int ret;
13681351

13691352
if (IS_ERR(obj))
@@ -1387,42 +1370,21 @@ static void *_msm_gem_kernel_new(struct drm_device *dev, uint32_t size,
13871370

13881371
return vaddr;
13891372
err:
1390-
if (locked)
1391-
drm_gem_object_put_locked(obj);
1392-
else
1393-
drm_gem_object_put(obj);
1373+
drm_gem_object_put(obj);
13941374

13951375
return ERR_PTR(ret);
13961376

13971377
}
13981378

1399-
void *msm_gem_kernel_new(struct drm_device *dev, uint32_t size,
1400-
uint32_t flags, struct msm_gem_address_space *aspace,
1401-
struct drm_gem_object **bo, uint64_t *iova)
1402-
{
1403-
return _msm_gem_kernel_new(dev, size, flags, aspace, bo, iova, false);
1404-
}
1405-
1406-
void *msm_gem_kernel_new_locked(struct drm_device *dev, uint32_t size,
1407-
uint32_t flags, struct msm_gem_address_space *aspace,
1408-
struct drm_gem_object **bo, uint64_t *iova)
1409-
{
1410-
return _msm_gem_kernel_new(dev, size, flags, aspace, bo, iova, true);
1411-
}
1412-
14131379
void msm_gem_kernel_put(struct drm_gem_object *bo,
1414-
struct msm_gem_address_space *aspace, bool locked)
1380+
struct msm_gem_address_space *aspace)
14151381
{
14161382
if (IS_ERR_OR_NULL(bo))
14171383
return;
14181384

14191385
msm_gem_put_vaddr(bo);
14201386
msm_gem_unpin_iova(bo, aspace);
1421-
1422-
if (locked)
1423-
drm_gem_object_put_locked(bo);
1424-
else
1425-
drm_gem_object_put(bo);
1387+
drm_gem_object_put(bo);
14261388
}
14271389

14281390
void msm_gem_object_set_name(struct drm_gem_object *bo, const char *fmt, ...)

‎drivers/gpu/drm/msm/msm_gem.h

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -154,16 +154,11 @@ int msm_gem_new_handle(struct drm_device *dev, struct drm_file *file,
154154
uint32_t size, uint32_t flags, uint32_t *handle, char *name);
155155
struct drm_gem_object *msm_gem_new(struct drm_device *dev,
156156
uint32_t size, uint32_t flags);
157-
struct drm_gem_object *msm_gem_new_locked(struct drm_device *dev,
158-
uint32_t size, uint32_t flags);
159157
void *msm_gem_kernel_new(struct drm_device *dev, uint32_t size,
160158
uint32_t flags, struct msm_gem_address_space *aspace,
161159
struct drm_gem_object **bo, uint64_t *iova);
162-
void *msm_gem_kernel_new_locked(struct drm_device *dev, uint32_t size,
163-
uint32_t flags, struct msm_gem_address_space *aspace,
164-
struct drm_gem_object **bo, uint64_t *iova);
165160
void msm_gem_kernel_put(struct drm_gem_object *bo,
166-
struct msm_gem_address_space *aspace, bool locked);
161+
struct msm_gem_address_space *aspace);
167162
struct drm_gem_object *msm_gem_import(struct drm_device *dev,
168163
struct dma_buf *dmabuf, struct sg_table *sgt);
169164
__printf(2, 3)

0 commit comments

Comments
 (0)