aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/gpu/drm/msm/adreno/a5xx_debugfs.c4
-rw-r--r--drivers/gpu/drm/msm/adreno/a5xx_gpu.c2
-rw-r--r--drivers/gpu/drm/msm/adreno/a5xx_power.c2
-rw-r--r--drivers/gpu/drm/msm/adreno/a5xx_preempt.c2
-rw-r--r--drivers/gpu/drm/msm/adreno/a6xx_gpu.c2
-rw-r--r--drivers/gpu/drm/msm/msm_gem_submit.c4
6 files changed, 8 insertions, 8 deletions
diff --git a/drivers/gpu/drm/msm/adreno/a5xx_debugfs.c b/drivers/gpu/drm/msm/adreno/a5xx_debugfs.c
index 059ec7d394d0..d2127b1c4ece 100644
--- a/drivers/gpu/drm/msm/adreno/a5xx_debugfs.c
+++ b/drivers/gpu/drm/msm/adreno/a5xx_debugfs.c
@@ -132,14 +132,14 @@ reset_set(void *data, u64 val)
132 if (a5xx_gpu->pm4_bo) { 132 if (a5xx_gpu->pm4_bo) {
133 if (a5xx_gpu->pm4_iova) 133 if (a5xx_gpu->pm4_iova)
134 msm_gem_put_iova(a5xx_gpu->pm4_bo, gpu->aspace); 134 msm_gem_put_iova(a5xx_gpu->pm4_bo, gpu->aspace);
135 drm_gem_object_unreference(a5xx_gpu->pm4_bo); 135 drm_gem_object_put(a5xx_gpu->pm4_bo);
136 a5xx_gpu->pm4_bo = NULL; 136 a5xx_gpu->pm4_bo = NULL;
137 } 137 }
138 138
139 if (a5xx_gpu->pfp_bo) { 139 if (a5xx_gpu->pfp_bo) {
140 if (a5xx_gpu->pfp_iova) 140 if (a5xx_gpu->pfp_iova)
141 msm_gem_put_iova(a5xx_gpu->pfp_bo, gpu->aspace); 141 msm_gem_put_iova(a5xx_gpu->pfp_bo, gpu->aspace);
142 drm_gem_object_unreference(a5xx_gpu->pfp_bo); 142 drm_gem_object_put(a5xx_gpu->pfp_bo);
143 a5xx_gpu->pfp_bo = NULL; 143 a5xx_gpu->pfp_bo = NULL;
144 } 144 }
145 145
diff --git a/drivers/gpu/drm/msm/adreno/a5xx_gpu.c b/drivers/gpu/drm/msm/adreno/a5xx_gpu.c
index ab1d9308c311..6a6849309b6a 100644
--- a/drivers/gpu/drm/msm/adreno/a5xx_gpu.c
+++ b/drivers/gpu/drm/msm/adreno/a5xx_gpu.c
@@ -1234,7 +1234,7 @@ static void a5xx_crashdumper_free(struct msm_gpu *gpu,
1234 msm_gem_put_iova(dumper->bo, gpu->aspace); 1234 msm_gem_put_iova(dumper->bo, gpu->aspace);
1235 msm_gem_put_vaddr(dumper->bo); 1235 msm_gem_put_vaddr(dumper->bo);
1236 1236
1237 drm_gem_object_unreference(dumper->bo); 1237 drm_gem_object_put(dumper->bo);
1238} 1238}
1239 1239
1240static int a5xx_crashdumper_run(struct msm_gpu *gpu, 1240static int a5xx_crashdumper_run(struct msm_gpu *gpu,
diff --git a/drivers/gpu/drm/msm/adreno/a5xx_power.c b/drivers/gpu/drm/msm/adreno/a5xx_power.c
index e9c0e56dbec0..7a41e1c147e4 100644
--- a/drivers/gpu/drm/msm/adreno/a5xx_power.c
+++ b/drivers/gpu/drm/msm/adreno/a5xx_power.c
@@ -323,7 +323,7 @@ err:
323 if (a5xx_gpu->gpmu_iova) 323 if (a5xx_gpu->gpmu_iova)
324 msm_gem_put_iova(a5xx_gpu->gpmu_bo, gpu->aspace); 324 msm_gem_put_iova(a5xx_gpu->gpmu_bo, gpu->aspace);
325 if (a5xx_gpu->gpmu_bo) 325 if (a5xx_gpu->gpmu_bo)
326 drm_gem_object_unreference(a5xx_gpu->gpmu_bo); 326 drm_gem_object_put(a5xx_gpu->gpmu_bo);
327 327
328 a5xx_gpu->gpmu_bo = NULL; 328 a5xx_gpu->gpmu_bo = NULL;
329 a5xx_gpu->gpmu_iova = 0; 329 a5xx_gpu->gpmu_iova = 0;
diff --git a/drivers/gpu/drm/msm/adreno/a5xx_preempt.c b/drivers/gpu/drm/msm/adreno/a5xx_preempt.c
index 6a3c560ba5c3..4c357ead1be6 100644
--- a/drivers/gpu/drm/msm/adreno/a5xx_preempt.c
+++ b/drivers/gpu/drm/msm/adreno/a5xx_preempt.c
@@ -276,7 +276,7 @@ void a5xx_preempt_fini(struct msm_gpu *gpu)
276 if (a5xx_gpu->preempt_iova[i]) 276 if (a5xx_gpu->preempt_iova[i])
277 msm_gem_put_iova(a5xx_gpu->preempt_bo[i], gpu->aspace); 277 msm_gem_put_iova(a5xx_gpu->preempt_bo[i], gpu->aspace);
278 278
279 drm_gem_object_unreference(a5xx_gpu->preempt_bo[i]); 279 drm_gem_object_put(a5xx_gpu->preempt_bo[i]);
280 a5xx_gpu->preempt_bo[i] = NULL; 280 a5xx_gpu->preempt_bo[i] = NULL;
281 } 281 }
282} 282}
diff --git a/drivers/gpu/drm/msm/adreno/a6xx_gpu.c b/drivers/gpu/drm/msm/adreno/a6xx_gpu.c
index 9a14cb3d5027..5f36b8d88240 100644
--- a/drivers/gpu/drm/msm/adreno/a6xx_gpu.c
+++ b/drivers/gpu/drm/msm/adreno/a6xx_gpu.c
@@ -744,7 +744,7 @@ static void a6xx_destroy(struct msm_gpu *gpu)
744 if (a6xx_gpu->sqe_bo) { 744 if (a6xx_gpu->sqe_bo) {
745 if (a6xx_gpu->sqe_iova) 745 if (a6xx_gpu->sqe_iova)
746 msm_gem_put_iova(a6xx_gpu->sqe_bo, gpu->aspace); 746 msm_gem_put_iova(a6xx_gpu->sqe_bo, gpu->aspace);
747 drm_gem_object_unreference_unlocked(a6xx_gpu->sqe_bo); 747 drm_gem_object_put_unlocked(a6xx_gpu->sqe_bo);
748 } 748 }
749 749
750 a6xx_gmu_remove(a6xx_gpu); 750 a6xx_gmu_remove(a6xx_gpu);
diff --git a/drivers/gpu/drm/msm/msm_gem_submit.c b/drivers/gpu/drm/msm/msm_gem_submit.c
index 7bd83e0afa97..7a7923e6220d 100644
--- a/drivers/gpu/drm/msm/msm_gem_submit.c
+++ b/drivers/gpu/drm/msm/msm_gem_submit.c
@@ -144,7 +144,7 @@ static int submit_lookup_objects(struct msm_gem_submit *submit,
144 goto out_unlock; 144 goto out_unlock;
145 } 145 }
146 146
147 drm_gem_object_reference(obj); 147 drm_gem_object_get(obj);
148 148
149 submit->bos[i].obj = msm_obj; 149 submit->bos[i].obj = msm_obj;
150 150
@@ -396,7 +396,7 @@ static void submit_cleanup(struct msm_gem_submit *submit)
396 struct msm_gem_object *msm_obj = submit->bos[i].obj; 396 struct msm_gem_object *msm_obj = submit->bos[i].obj;
397 submit_unlock_unpin_bo(submit, i, false); 397 submit_unlock_unpin_bo(submit, i, false);
398 list_del_init(&msm_obj->submit_entry); 398 list_del_init(&msm_obj->submit_entry);
399 drm_gem_object_unreference(&msm_obj->base); 399 drm_gem_object_put(&msm_obj->base);
400 } 400 }
401 401
402 ww_acquire_fini(&submit->ticket); 402 ww_acquire_fini(&submit->ticket);