Skip to content

Commit 202f98c

Browse files
committed
drm/msm/gem: Remove submit_unlock_unpin_bo()
The only point it is called is before pinning objects, so the "unpin" part of the name is fiction. Just remove it and call submit_cleanup_bo() directly. Signed-off-by: Rob Clark <robdclark@chromium.org> Reviewed-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org> Patchwork: https://patchwork.freedesktop.org/patch/568330/
1 parent a3dec9c commit 202f98c

File tree

1 file changed

+2
-8
lines changed

1 file changed

+2
-8
lines changed

drivers/gpu/drm/msm/msm_gem_submit.c

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -272,12 +272,6 @@ static void submit_cleanup_bo(struct msm_gem_submit *submit, int i,
272272
dma_resv_unlock(obj->resv);
273273
}
274274

275-
static void submit_unlock_unpin_bo(struct msm_gem_submit *submit, int i)
276-
{
277-
unsigned cleanup_flags = BO_PINNED | BO_LOCKED;
278-
submit_cleanup_bo(submit, i, cleanup_flags);
279-
}
280-
281275
/* This is where we make sure all the bo's are reserved and pin'd: */
282276
static int submit_lock_objects(struct msm_gem_submit *submit)
283277
{
@@ -313,10 +307,10 @@ static int submit_lock_objects(struct msm_gem_submit *submit)
313307
}
314308

315309
for (; i >= 0; i--)
316-
submit_unlock_unpin_bo(submit, i);
310+
submit_cleanup_bo(submit, i, BO_LOCKED);
317311

318312
if (slow_locked > 0)
319-
submit_unlock_unpin_bo(submit, slow_locked);
313+
submit_cleanup_bo(submit, slow_locked, BO_LOCKED);
320314

321315
if (ret == -EDEADLK) {
322316
struct drm_gem_object *obj = submit->bos[contended].obj;

0 commit comments

Comments
 (0)