Split out a helper to check madv state, and inline what remains of msm_gem_get_pages_locked() in get_vaddr(). The vmap path is already disallowed on imported dma-bufs. And the rest of the callers of msm_gem_get_pages_locked() don't actually care about the pages, they just want to know that the obj is resident.
This gets us one step closer to not actually caring about the page array for imported dma-bufs. Signed-off-by: Rob Clark <[email protected]> --- drivers/gpu/drm/msm/msm_gem.c | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/drivers/gpu/drm/msm/msm_gem.c b/drivers/gpu/drm/msm/msm_gem.c index c90336b3b231..bf6a8939af7c 100644 --- a/drivers/gpu/drm/msm/msm_gem.c +++ b/drivers/gpu/drm/msm/msm_gem.c @@ -265,7 +265,7 @@ static void put_pages(struct drm_gem_object *obj) } } -struct page **msm_gem_get_pages_locked(struct drm_gem_object *obj, unsigned madv) +static int check_madv_locked(struct drm_gem_object *obj, unsigned madv) { struct msm_gem_object *msm_obj = to_msm_bo(obj); @@ -274,9 +274,17 @@ struct page **msm_gem_get_pages_locked(struct drm_gem_object *obj, unsigned madv if (msm_obj->madv > madv) { DRM_DEV_DEBUG_DRIVER(obj->dev->dev, "Invalid madv state: %u vs %u\n", msm_obj->madv, madv); - return ERR_PTR(-EBUSY); + return -EBUSY; } + return 0; +} + +struct page **msm_gem_get_pages_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); } @@ -722,7 +730,11 @@ static void *get_vaddr(struct drm_gem_object *obj, unsigned madv) if (drm_gem_is_imported(obj)) return ERR_PTR(-ENODEV); - pages = msm_gem_get_pages_locked(obj, madv); + int err = check_madv_locked(obj, madv); + if (err) + return ERR_PTR(err); + + pages = get_pages(obj); if (IS_ERR(pages)) return ERR_CAST(pages); -- 2.55.0
