The remaining callers of msm_gem_pin_pages_locked() and msm_gem_get_pages_locked() don't actually care about pages, other than as a conduit for returning an error. So convert them to just directly return an int instead.
And rename _get_pages_locked() to _make_resident_locked() to better reflect it's purpose. Signed-off-by: Rob Clark <[email protected]> --- drivers/gpu/drm/msm/msm_gem.c | 28 ++++++++++++++++------------ drivers/gpu/drm/msm/msm_gem.h | 4 ++-- drivers/gpu/drm/msm/msm_gem_prime.c | 5 +---- drivers/gpu/drm/msm/msm_gem_vma.c | 8 ++++---- 4 files changed, 23 insertions(+), 22 deletions(-) diff --git a/drivers/gpu/drm/msm/msm_gem.c b/drivers/gpu/drm/msm/msm_gem.c index bf6a8939af7c..2341f209adf5 100644 --- a/drivers/gpu/drm/msm/msm_gem.c +++ b/drivers/gpu/drm/msm/msm_gem.c @@ -280,12 +280,16 @@ static int check_madv_locked(struct drm_gem_object *obj, unsigned madv) return 0; } -struct page **msm_gem_get_pages_locked(struct drm_gem_object *obj, unsigned madv) +int msm_gem_make_resident_locked(struct drm_gem_object *obj, unsigned madv) { int err = check_madv_locked(obj, madv); if (err) - return ERR_PTR(err); - return get_pages(obj); + return err; + + struct page **pages = get_pages(obj); + if (IS_ERR(pages)) + return PTR_ERR(pages); + return 0; } /* @@ -310,17 +314,17 @@ static void pin_obj_locked(struct drm_gem_object *obj) mutex_unlock(&dev->gem_lru_mutex); } -struct page **msm_gem_pin_pages_locked(struct drm_gem_object *obj) +int msm_gem_pin_pages_locked(struct drm_gem_object *obj) { - struct page **p; + int ret; msm_gem_assert_locked(obj); - p = msm_gem_get_pages_locked(obj, MSM_MADV_WILLNEED); - if (!IS_ERR(p)) + ret = msm_gem_make_resident_locked(obj, MSM_MADV_WILLNEED); + if (!ret) pin_obj_locked(obj); - return p; + return ret; } void msm_gem_unpin_pages_locked(struct drm_gem_object *obj) @@ -487,14 +491,14 @@ int msm_gem_prot(struct drm_gem_object *obj) int msm_gem_pin_vma_locked(struct drm_gem_object *obj, struct drm_gpuva *vma) { struct msm_gem_object *msm_obj = to_msm_bo(obj); - struct page **pages; int prot = msm_gem_prot(obj); + int ret; msm_gem_assert_locked(obj); - pages = msm_gem_get_pages_locked(obj, MSM_MADV_WILLNEED); - if (IS_ERR(pages)) - return PTR_ERR(pages); + ret = msm_gem_make_resident_locked(obj, MSM_MADV_WILLNEED); + if (ret) + return ret; return msm_gem_vma_map(vma, prot, msm_obj->sgt); } diff --git a/drivers/gpu/drm/msm/msm_gem.h b/drivers/gpu/drm/msm/msm_gem.h index 73dafe080bfd..4f681100ecb0 100644 --- a/drivers/gpu/drm/msm/msm_gem.h +++ b/drivers/gpu/drm/msm/msm_gem.h @@ -279,8 +279,8 @@ int msm_gem_get_and_pin_iova(struct drm_gem_object *obj, struct drm_gpuvm *vm, uint64_t *iova); void msm_gem_unpin_iova(struct drm_gem_object *obj, struct drm_gpuvm *vm); void msm_gem_pin_obj_locked(struct drm_gem_object *obj); -struct page **msm_gem_get_pages_locked(struct drm_gem_object *obj, unsigned madv); -struct page **msm_gem_pin_pages_locked(struct drm_gem_object *obj); +int msm_gem_make_resident_locked(struct drm_gem_object *obj, unsigned madv); +int msm_gem_pin_pages_locked(struct drm_gem_object *obj); void msm_gem_unpin_pages_locked(struct drm_gem_object *obj); int msm_gem_dumb_create(struct drm_file *file, struct drm_device *dev, struct drm_mode_create_dumb *args); diff --git a/drivers/gpu/drm/msm/msm_gem_prime.c b/drivers/gpu/drm/msm/msm_gem_prime.c index beb7f22fd694..b14cda87df4f 100644 --- a/drivers/gpu/drm/msm/msm_gem_prime.c +++ b/drivers/gpu/drm/msm/msm_gem_prime.c @@ -109,7 +109,6 @@ struct dma_buf *msm_gem_prime_export(struct drm_gem_object *obj, int flags) int msm_gem_prime_pin(struct drm_gem_object *obj) { - struct page **pages; int ret = 0; if (drm_gem_is_imported(obj)) @@ -118,9 +117,7 @@ int msm_gem_prime_pin(struct drm_gem_object *obj) if (to_msm_bo(obj)->flags & MSM_BO_NO_SHARE) return -EINVAL; - pages = msm_gem_pin_pages_locked(obj); - if (IS_ERR(pages)) - ret = PTR_ERR(pages); + return msm_gem_pin_pages_locked(obj); return ret; } diff --git a/drivers/gpu/drm/msm/msm_gem_vma.c b/drivers/gpu/drm/msm/msm_gem_vma.c index c11d021581e0..311205c7f1ba 100644 --- a/drivers/gpu/drm/msm/msm_gem_vma.c +++ b/drivers/gpu/drm/msm/msm_gem_vma.c @@ -1300,11 +1300,11 @@ vm_bind_job_pin_objects(struct msm_vm_bind_job *job) * trigger get_pages()) */ job_foreach_bo (obj, job) { - struct page **pages; + int ret; - pages = msm_gem_get_pages_locked(obj, MSM_MADV_WILLNEED); - if (IS_ERR(pages)) - return PTR_ERR(pages); + ret = msm_gem_make_resident_locked(obj, MSM_MADV_WILLNEED); + if (ret) + return ret; } struct drm_device *dev = job->vm->drm; -- 2.55.0
