drm/msm/dpu: move the rest of plane checks to dpu_plane_atomic_check()

Move plane state updates from dpu_crtc_atomic_check() to the function
where they belong: to dpu_plane_atomic_check().

Reviewed-by: Abhinav Kumar <quic_abhinavk@quicinc.com>
Tested-by: Abhinav Kumar <quic_abhinavk@quicinc.com> # sc7280
Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
Patchwork: https://patchwork.freedesktop.org/patch/527335/
Link: https://lore.kernel.org/r/20230316161653.4106395-17-dmitry.baryshkov@linaro.org
Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>

diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c
index 94e8bda..094fc11 100644 (file)
--- a/drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c
+++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c
@@ -1154,7 +1154,6 @@ static int dpu_crtc_atomic_check(struct drm_crtc *crtc,
                                                                          crtc);
        struct dpu_crtc *dpu_crtc = to_dpu_crtc(crtc);
        struct dpu_crtc_state *cstate = to_dpu_crtc_state(crtc_state);
-       struct dpu_kms *dpu_kms = _dpu_crtc_get_kms(crtc);
 
        const struct drm_plane_state *pstate;
        struct drm_plane *plane;
@@ -1186,11 +1185,10 @@ static int dpu_crtc_atomic_check(struct drm_crtc *crtc,
        crtc_rect.x2 = mode->hdisplay;
        crtc_rect.y2 = mode->vdisplay;
 
-        /* get plane state for all drm planes associated with crtc state */
+       /* FIXME: move this to dpu_plane_atomic_check? */
        drm_atomic_crtc_state_for_each_plane_state(plane, pstate, crtc_state) {
                struct dpu_plane_state *dpu_pstate = to_dpu_plane_state(pstate);
                struct drm_rect dst, clip = crtc_rect;
-               int stage;
 
                if (IS_ERR_OR_NULL(pstate)) {
                        rc = PTR_ERR(pstate);
@@ -1204,8 +1202,6 @@ static int dpu_crtc_atomic_check(struct drm_crtc *crtc,
 
                dpu_pstate->needs_dirtyfb = needs_dirtyfb;
 
-               dpu_plane_clear_multirect(pstate);
-
                dst = drm_plane_state_dest(pstate);
                if (!drm_rect_intersect(&clip, &dst)) {
                        DPU_ERROR("invalid vertical/horizontal destination\n");
@@ -1214,18 +1210,6 @@ static int dpu_crtc_atomic_check(struct drm_crtc *crtc,
                                  DRM_RECT_ARG(&dst));
                        return -E2BIG;
                }
-
-               /* verify stage setting before using it */
-               stage = DPU_STAGE_0 + pstate->normalized_zpos;
-               if (stage >= dpu_kms->catalog->caps->max_mixer_blendstages) {
-                       DPU_ERROR("> %d plane stages assigned\n",
-                                 dpu_kms->catalog->caps->max_mixer_blendstages - DPU_STAGE_0);
-                       return -EINVAL;
-               }
-
-               to_dpu_plane_state(pstate)->stage = stage;
-               DRM_DEBUG_ATOMIC("%s: stage %d\n", dpu_crtc->name, stage);
-
        }
 
        atomic_inc(&_dpu_crtc_get_kms(crtc)->bandwidth_ref);

diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c
index 25233c9..94c0a62 100644 (file)
--- a/drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c
+++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c
@@ -734,14 +734,6 @@ static int _dpu_plane_color_fill(struct dpu_plane *pdpu,
        return 0;
 }
 
-void dpu_plane_clear_multirect(const struct drm_plane_state *drm_state)
-{
-       struct dpu_plane_state *pstate = to_dpu_plane_state(drm_state);
-
-       pstate->pipe.multirect_index = DPU_SSPP_RECT_SOLO;
-       pstate->pipe.multirect_mode = DPU_SSPP_MULTIRECT_NONE;
-}
-
 int dpu_plane_validate_multirect_v2(struct dpu_multirect_plane_states *plane)
 {
        struct dpu_plane_state *pstate[R_MAX];
@@ -995,6 +987,16 @@ static int dpu_plane_atomic_check(struct drm_plane *plane,
        if (!new_plane_state->visible)
                return 0;
 
+       pstate->pipe.multirect_index = DPU_SSPP_RECT_SOLO;
+       pstate->pipe.multirect_mode = DPU_SSPP_MULTIRECT_NONE;
+
+       pstate->stage = DPU_STAGE_0 + pstate->base.normalized_zpos;
+       if (pstate->stage >= pdpu->catalog->caps->max_mixer_blendstages) {
+               DPU_ERROR("> %d plane stages assigned\n",
+                         pdpu->catalog->caps->max_mixer_blendstages - DPU_STAGE_0);
+               return -EINVAL;
+       }
+
        src.x1 = new_plane_state->src_x >> 16;
        src.y1 = new_plane_state->src_y >> 16;
        src.x2 = src.x1 + (new_plane_state->src_w >> 16);

diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_plane.h b/drivers/gpu/drm/msm/disp/dpu1/dpu_plane.h
index 228db40..a08b053 100644 (file)
--- a/drivers/gpu/drm/msm/disp/dpu1/dpu_plane.h
+++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_plane.h
@@ -89,12 +89,6 @@ struct drm_plane *dpu_plane_init(struct drm_device *dev,
 int dpu_plane_validate_multirect_v2(struct dpu_multirect_plane_states *plane);
 
 /**
- * dpu_plane_clear_multirect - clear multirect bits for the given pipe
- * @drm_state: Pointer to DRM plane state
- */
-void dpu_plane_clear_multirect(const struct drm_plane_state *drm_state);
-
-/**
  * dpu_plane_color_fill - enables color fill on plane
  * @plane:  Pointer to DRM plane object
  * @color:  RGB fill color value, [23..16] Blue, [15..8] Green, [7..0] Red