| Message ID | 20220209172520.3719906-19-dmitry.baryshkov@linaro.org |
|---|---|
| State | New |
| Headers | show |
| Series | drm/msm/dpu: wide planes support | expand |
On 2/9/2022 9:25 AM, Dmitry Baryshkov wrote: > Remove plane checks/state updates from dpu_crtc_atomic_check(). The > belong to dpu_plane_atomic_check(). > The --> They > Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org> > --- > drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c | 44 ----------------------- > drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c | 18 +++++----- > drivers/gpu/drm/msm/disp/dpu1/dpu_plane.h | 6 ---- > 3 files changed, 10 insertions(+), 58 deletions(-) > > diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c > index cbd0e50c2bd3..fa279f0358d6 100644 > --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c > +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c > @@ -1054,14 +1054,10 @@ static int dpu_crtc_atomic_check(struct drm_crtc *crtc, > struct dpu_crtc *dpu_crtc = to_dpu_crtc(crtc); > struct dpu_crtc_state *cstate = to_dpu_crtc_state(crtc_state); > > - const struct drm_plane_state *pstate; > - struct drm_plane *plane; > struct drm_display_mode *mode; > > int rc = 0; > > - struct drm_rect crtc_rect = { 0 }; > - > if (!crtc_state->enable || !crtc_state->active) { > DRM_DEBUG_ATOMIC("crtc%d -> enable %d, active %d, skip atomic_check\n", > crtc->base.id, crtc_state->enable, > @@ -1080,46 +1076,6 @@ static int dpu_crtc_atomic_check(struct drm_crtc *crtc, > if (cstate->num_mixers) > _dpu_crtc_setup_lm_bounds(crtc, crtc_state); > > - crtc_rect.x2 = mode->hdisplay; > - crtc_rect.y2 = mode->vdisplay; > - > - /* get plane state for all drm planes associated with crtc state */ > - drm_atomic_crtc_state_for_each_plane_state(plane, pstate, crtc_state) { > - struct drm_rect dst, clip = crtc_rect; > - int z_pos; > - > - if (IS_ERR_OR_NULL(pstate)) { > - rc = PTR_ERR(pstate); > - DPU_ERROR("%s: failed to get plane%d state, %d\n", > - dpu_crtc->name, plane->base.id, rc); > - return rc; > - } > - > - dpu_plane_clear_multirect(pstate); > - > - dst = drm_plane_state_dest(pstate); > - if (!drm_rect_intersect(&clip, &dst)) { > - DPU_ERROR("invalid vertical/horizontal destination\n"); > - DPU_ERROR("display: " DRM_RECT_FMT " plane: " > - DRM_RECT_FMT "\n", DRM_RECT_ARG(&crtc_rect), > - DRM_RECT_ARG(&dst)); > - return -E2BIG; > - } Doesnt this check also have to be moved? We need to make sure dest rectangle is within CRTC bounds? > - > - z_pos = pstate->normalized_zpos; > - > - /* verify z_pos setting before using it */ > - if (z_pos >= DPU_STAGE_MAX - DPU_STAGE_0) { > - DPU_ERROR("> %d plane stages assigned\n", > - DPU_STAGE_MAX - DPU_STAGE_0); > - return -EINVAL; > - } > - > - to_dpu_plane_state(pstate)->stage = z_pos + DPU_STAGE_0; > - DRM_DEBUG_ATOMIC("%s: zpos %d\n", dpu_crtc->name, z_pos); > - > - } > - > atomic_inc(&_dpu_crtc_get_kms(crtc)->bandwidth_ref); > > rc = dpu_core_perf_crtc_check(crtc, crtc_state); > diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c > index b2395f02f6d3..637d164667e9 100644 > --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c > +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c > @@ -702,14 +702,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]; > @@ -931,6 +923,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 >= DPU_STAGE_MAX) { > + DPU_ERROR("> %d plane stages assigned\n", > + DPU_STAGE_MAX - 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 b6fd6f856d6a..e61c57b045ea 100644 > --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_plane.h > +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_plane.h > @@ -83,12 +83,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
diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c index cbd0e50c2bd3..fa279f0358d6 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c @@ -1054,14 +1054,10 @@ static int dpu_crtc_atomic_check(struct drm_crtc *crtc, struct dpu_crtc *dpu_crtc = to_dpu_crtc(crtc); struct dpu_crtc_state *cstate = to_dpu_crtc_state(crtc_state); - const struct drm_plane_state *pstate; - struct drm_plane *plane; struct drm_display_mode *mode; int rc = 0; - struct drm_rect crtc_rect = { 0 }; - if (!crtc_state->enable || !crtc_state->active) { DRM_DEBUG_ATOMIC("crtc%d -> enable %d, active %d, skip atomic_check\n", crtc->base.id, crtc_state->enable, @@ -1080,46 +1076,6 @@ static int dpu_crtc_atomic_check(struct drm_crtc *crtc, if (cstate->num_mixers) _dpu_crtc_setup_lm_bounds(crtc, crtc_state); - crtc_rect.x2 = mode->hdisplay; - crtc_rect.y2 = mode->vdisplay; - - /* get plane state for all drm planes associated with crtc state */ - drm_atomic_crtc_state_for_each_plane_state(plane, pstate, crtc_state) { - struct drm_rect dst, clip = crtc_rect; - int z_pos; - - if (IS_ERR_OR_NULL(pstate)) { - rc = PTR_ERR(pstate); - DPU_ERROR("%s: failed to get plane%d state, %d\n", - dpu_crtc->name, plane->base.id, rc); - return rc; - } - - dpu_plane_clear_multirect(pstate); - - dst = drm_plane_state_dest(pstate); - if (!drm_rect_intersect(&clip, &dst)) { - DPU_ERROR("invalid vertical/horizontal destination\n"); - DPU_ERROR("display: " DRM_RECT_FMT " plane: " - DRM_RECT_FMT "\n", DRM_RECT_ARG(&crtc_rect), - DRM_RECT_ARG(&dst)); - return -E2BIG; - } - - z_pos = pstate->normalized_zpos; - - /* verify z_pos setting before using it */ - if (z_pos >= DPU_STAGE_MAX - DPU_STAGE_0) { - DPU_ERROR("> %d plane stages assigned\n", - DPU_STAGE_MAX - DPU_STAGE_0); - return -EINVAL; - } - - to_dpu_plane_state(pstate)->stage = z_pos + DPU_STAGE_0; - DRM_DEBUG_ATOMIC("%s: zpos %d\n", dpu_crtc->name, z_pos); - - } - atomic_inc(&_dpu_crtc_get_kms(crtc)->bandwidth_ref); rc = dpu_core_perf_crtc_check(crtc, crtc_state); diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c index b2395f02f6d3..637d164667e9 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c @@ -702,14 +702,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]; @@ -931,6 +923,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 >= DPU_STAGE_MAX) { + DPU_ERROR("> %d plane stages assigned\n", + DPU_STAGE_MAX - 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 b6fd6f856d6a..e61c57b045ea 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_plane.h +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_plane.h @@ -83,12 +83,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
Remove plane checks/state updates from dpu_crtc_atomic_check(). The belong to dpu_plane_atomic_check(). Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org> --- drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c | 44 ----------------------- drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c | 18 +++++----- drivers/gpu/drm/msm/disp/dpu1/dpu_plane.h | 6 ---- 3 files changed, 10 insertions(+), 58 deletions(-)