[PATCH 2/9] drm/msm/dpu: drop dpu_format_populate_layout from dpu_plane_sspp_atomic_update

[Dmitry Baryshkov]

The dpu_plane_prepare_fb() already calls dpu_format_populate_layout().
Store the generated layour in the plane state and drop this call from
dpu_plane_sspp_update().

Signed-off-by: Dmitry Baryshkov <dmitry.barysh...@linaro.org>
---
 drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c | 19 ++++---------------
 drivers/gpu/drm/msm/disp/dpu1/dpu_plane.h |  3 +++
 2 files changed, 7 insertions(+), 15 deletions(-)

diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c 
b/drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c
index ff975ad51145..5b15d8068187 100644
--- a/drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c
+++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c
@@ -646,7 +646,6 @@ static int dpu_plane_prepare_fb(struct drm_plane *plane,
        struct drm_framebuffer *fb = new_state->fb;
        struct dpu_plane *pdpu = to_dpu_plane(plane);
        struct dpu_plane_state *pstate = to_dpu_plane_state(new_state);
-       struct dpu_hw_fmt_layout layout;
        struct dpu_kms *kms = _dpu_plane_get_kms(&pdpu->base);
        int ret;
 
@@ -676,7 +675,8 @@ static int dpu_plane_prepare_fb(struct drm_plane *plane,
 
        /* validate framebuffer layout before commit */
        ret = dpu_format_populate_layout(pstate->aspace,
-                       new_state->fb, &layout);
+                                        new_state->fb,
+                                        &pstate->layout);
        if (ret) {
                DPU_ERROR_PLANE(pdpu, "failed to get format layout, %d\n", ret);
                return ret;
@@ -1099,17 +1099,6 @@ static void dpu_plane_sspp_atomic_update(struct 
drm_plane *plane)
                to_dpu_format(msm_framebuffer_format(fb));
        struct dpu_sw_pipe_cfg *pipe_cfg = &pstate->pipe_cfg;
        struct dpu_sw_pipe_cfg *r_pipe_cfg = &pstate->r_pipe_cfg;
-       struct dpu_kms *kms = _dpu_plane_get_kms(&pdpu->base);
-       struct msm_gem_address_space *aspace = kms->base.aspace;
-       struct dpu_hw_fmt_layout layout;
-       bool layout_valid = false;
-       int ret;
-
-       ret = dpu_format_populate_layout(aspace, fb, &layout);
-       if (ret)
-               DPU_ERROR_PLANE(pdpu, "failed to get format layout, %d\n", ret);
-       else
-               layout_valid = true;
 
        pstate->pending = true;
 
@@ -1124,12 +1113,12 @@ static void dpu_plane_sspp_atomic_update(struct 
drm_plane *plane)
 
        dpu_plane_sspp_update_pipe(plane, pipe, pipe_cfg, fmt,
                                   drm_mode_vrefresh(&crtc->mode),
-                                  layout_valid ? &layout : NULL);
+                                  &pstate->layout);
 
        if (r_pipe->sspp) {
                dpu_plane_sspp_update_pipe(plane, r_pipe, r_pipe_cfg, fmt,
                                           drm_mode_vrefresh(&crtc->mode),
-                                          layout_valid ? &layout : NULL);
+                                          &pstate->layout);
        }
 
        if (pstate->needs_qos_remap)
diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_plane.h 
b/drivers/gpu/drm/msm/disp/dpu1/dpu_plane.h
index abd6b21a049b..348b0075d1ce 100644
--- a/drivers/gpu/drm/msm/disp/dpu1/dpu_plane.h
+++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_plane.h
@@ -31,6 +31,7 @@
  * @plane_clk: calculated clk per plane
  * @needs_dirtyfb: whether attached CRTC needs pixel data explicitly flushed
  * @rotation: simplified drm rotation hint
+ * @layout:     framebuffer memory layout
  */
 struct dpu_plane_state {
        struct drm_plane_state base;
@@ -48,6 +49,8 @@ struct dpu_plane_state {
 
        bool needs_dirtyfb;
        unsigned int rotation;
+
+       struct dpu_hw_fmt_layout layout;
 };
 
 #define to_dpu_plane_state(x) \

-- 
2.39.2