drm/msm/dpu: Revise _dpu_plane_get_aspace

Remove unneeded checks from _dpu_plane_get_aspace.

v3: change _dpu_plane_get_aspace to return a struct
*msm_gem_address_space instead passing in a pointer of the same
type to edit. Remove uneeded arguments.

Reviewed-by: Jordan Crouse <jcrouse@codeaurora.org>
Signed-off-by: Bruce Wang <bzwang@chromium.org>
Signed-off-by: Sean Paul <seanpaul@chromium.org>
Signed-off-by: Rob Clark <robdclark@gmail.com>

diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c
index 22e3b74acfd5c11666f1f3586e6be741ff98bc68..fc59a69aa8323e0ad5113e31500e28d25a6bd577 100644 (file)
--- a/drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c
+++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c
@@ -433,23 +433,12 @@ static void _dpu_plane_set_qos_remap(struct drm_plane *plane)
 /**
  * _dpu_plane_get_aspace: gets the address space
  */
-static int _dpu_plane_get_aspace(
-               struct dpu_plane *pdpu,
-               struct dpu_plane_state *pstate,
-               struct msm_gem_address_space **aspace)
+static inline struct msm_gem_address_space *_dpu_plane_get_aspace(
+               struct dpu_plane *pdpu)
 {
-       struct dpu_kms *kms;
-
-       if (!pdpu || !pstate || !aspace) {
-               DPU_ERROR("invalid parameters\n");
-               return -EINVAL;
-       }
-
-       kms = _dpu_plane_get_kms(&pdpu->base);
+       struct dpu_kms *kms = _dpu_plane_get_kms(&pdpu->base);
 
-       *aspace = kms->base.aspace;
-
-       return 0;
+       return kms->base.aspace;
 }
 
 static inline void _dpu_plane_set_scanout(struct drm_plane *plane,
@@ -458,15 +447,9 @@ static inline void _dpu_plane_set_scanout(struct drm_plane *plane,
                struct drm_framebuffer *fb)
 {
        struct dpu_plane *pdpu = to_dpu_plane(plane);
-       struct msm_gem_address_space *aspace = NULL;
+       struct msm_gem_address_space *aspace = _dpu_plane_get_aspace(pdpu);
        int ret;
 
-       ret = _dpu_plane_get_aspace(pdpu, pstate, &aspace);
-       if (ret) {
-               DPU_ERROR_PLANE(pdpu, "Failed to get aspace %d\n", ret);
-               return;
-       }
-
        ret = dpu_format_populate_layout(aspace, fb, &pipe_cfg->layout);
        if (ret == -EAGAIN)
                DPU_DEBUG_PLANE(pdpu, "not updating same src addrs\n");
@@ -818,7 +801,7 @@ static int dpu_plane_prepare_fb(struct drm_plane *plane,
        struct drm_gem_object *obj;
        struct msm_gem_object *msm_obj;
        struct dma_fence *fence;
-       struct msm_gem_address_space *aspace;
+       struct msm_gem_address_space *aspace = _dpu_plane_get_aspace(pdpu);
        int ret;
 
        if (!new_state->fb)
@@ -826,12 +809,6 @@ static int dpu_plane_prepare_fb(struct drm_plane *plane,
 
        DPU_DEBUG_PLANE(pdpu, "FB[%u]\n", fb->base.id);
 
-       ret = _dpu_plane_get_aspace(pdpu, pstate, &aspace);
-       if (ret) {
-               DPU_ERROR_PLANE(pdpu, "Failed to get aspace\n");
-               return ret;
-       }
-
        /* cache aspace */
        pstate->aspace = aspace;