summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRob Clark <robdclark@chromium.org>2023-11-20 16:38:46 -0800
committerRob Clark <robdclark@chromium.org>2023-12-10 10:23:13 -0800
commit202f98c19a11e335867a1906c2fb6c53680e4603 (patch)
tree02de7f812fa8ba59612f880be1c563fddc65cdb0
parenta3dec9cdf42bceccdf7a7185099a515ba0a8b29b (diff)
downloadlinux-202f98c19a11e335867a1906c2fb6c53680e4603.tar.gz
linux-202f98c19a11e335867a1906c2fb6c53680e4603.tar.bz2
linux-202f98c19a11e335867a1906c2fb6c53680e4603.zip
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/
-rw-r--r--drivers/gpu/drm/msm/msm_gem_submit.c10
1 files changed, 2 insertions, 8 deletions
diff --git a/drivers/gpu/drm/msm/msm_gem_submit.c b/drivers/gpu/drm/msm/msm_gem_submit.c
index 2fdc373c2589..51726c9ddffd 100644
--- a/drivers/gpu/drm/msm/msm_gem_submit.c
+++ b/drivers/gpu/drm/msm/msm_gem_submit.c
@@ -272,12 +272,6 @@ static void submit_cleanup_bo(struct msm_gem_submit *submit, int i,
dma_resv_unlock(obj->resv);
}
-static void submit_unlock_unpin_bo(struct msm_gem_submit *submit, int i)
-{
- unsigned cleanup_flags = BO_PINNED | BO_LOCKED;
- submit_cleanup_bo(submit, i, cleanup_flags);
-}
-
/* This is where we make sure all the bo's are reserved and pin'd: */
static int submit_lock_objects(struct msm_gem_submit *submit)
{
@@ -313,10 +307,10 @@ fail:
}
for (; i >= 0; i--)
- submit_unlock_unpin_bo(submit, i);
+ submit_cleanup_bo(submit, i, BO_LOCKED);
if (slow_locked > 0)
- submit_unlock_unpin_bo(submit, slow_locked);
+ submit_cleanup_bo(submit, slow_locked, BO_LOCKED);
if (ret == -EDEADLK) {
struct drm_gem_object *obj = submit->bos[contended].obj;