On Thu, Dec 19, 2024 at 03:49:32PM +0800, Jun Nie wrote:
> Support SSPP assignment for quad-pipe case with unified method.
> The first 2 pipes can share a set of mixer config and enable
> multi-rect mode if condition is met. It is also the case for
> the later 2 pipes.
>
> Signed-off-by: Jun Nie <jun....@linaro.org>
> ---
> drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c | 67
> ++++++++++++++++++-------------
> 1 file changed, 38 insertions(+), 29 deletions(-)
>
> diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c
> b/drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c
> index 1cd98892898a4..57ccb73c45683 100644
> --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c
> +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c
> @@ -1163,12 +1163,9 @@ static int dpu_plane_virtual_assign_resources(struct
> drm_crtc *crtc,
> struct dpu_kms *dpu_kms = _dpu_plane_get_kms(plane);
> struct dpu_rm_sspp_requirements reqs;
> struct dpu_plane_state *pstate;
> - struct dpu_sw_pipe *pipe;
> - struct dpu_sw_pipe *r_pipe;
> - struct dpu_sw_pipe_cfg *pipe_cfg;
> - struct dpu_sw_pipe_cfg *r_pipe_cfg;
> + struct dpu_plane *pdpu = to_dpu_plane(plane);
> const struct msm_format *fmt;
> - int i;
> + int i, num_lm, stage_id, num_stages;
>
> if (plane_state->crtc)
> crtc_state = drm_atomic_get_new_crtc_state(state,
> @@ -1176,12 +1173,6 @@ static int dpu_plane_virtual_assign_resources(struct
> drm_crtc *crtc,
>
> pstate = to_dpu_plane_state(plane_state);
>
> - /* TODO: loop below code for another pair later */
> - pipe = &pstate->pipe[0];
> - r_pipe = &pstate->pipe[1];
> - pipe_cfg = &pstate->pipe_cfg[0];
> - r_pipe_cfg = &pstate->pipe_cfg[1];
> -
> for (i = 0; i < PIPES_PER_PLANE; i++)
> pstate->pipe[i].sspp = NULL;
>
> @@ -1195,24 +1186,42 @@ static int dpu_plane_virtual_assign_resources(struct
> drm_crtc *crtc,
>
> reqs.rot90 = drm_rotation_90_or_270(plane_state->rotation);
>
> - pipe->sspp = dpu_rm_reserve_sspp(&dpu_kms->rm, global_state, crtc,
> &reqs);
> - if (!pipe->sspp)
> - return -ENODEV;
> -
> - if (!dpu_plane_try_multirect_parallel(pipe, pipe_cfg, r_pipe,
> r_pipe_cfg,
> - pipe->sspp,
> -
> msm_framebuffer_format(plane_state->fb),
> -
> dpu_kms->catalog->caps->max_linewidth)) {
> - /* multirect is not possible, use two SSPP blocks */
> - r_pipe->sspp = dpu_rm_reserve_sspp(&dpu_kms->rm, global_state,
> crtc, &reqs);
> - if (!r_pipe->sspp)
> - return -ENODEV;
> -
> - pipe->multirect_index = DPU_SSPP_RECT_SOLO;
> - pipe->multirect_mode = DPU_SSPP_MULTIRECT_NONE;
> -
> - r_pipe->multirect_index = DPU_SSPP_RECT_SOLO;
> - r_pipe->multirect_mode = DPU_SSPP_MULTIRECT_NONE;
> + num_lm = dpu_crtc_get_num_lm(crtc_state);
> + num_stages = (num_lm + 1) / 2;
> + for (stage_id = 0; stage_id < num_stages; stage_id++) {
> + for (i = stage_id * PIPES_PER_STAGE; i < (stage_id + 1) *
> PIPES_PER_STAGE; i++) {
> + struct dpu_sw_pipe *pipe = &pstate->pipe[i];
> + struct dpu_sw_pipe *r_pipe = &pstate->pipe[i + 1];
> + struct dpu_sw_pipe_cfg *pipe_cfg = &pstate->pipe_cfg[i];
> + struct dpu_sw_pipe_cfg *r_pipe_cfg =
> &pstate->pipe_cfg[i + 1];
I'd rather not have r_pipe / r_pipe_cfg for the second pipe in the pair.
Please move them under the if.
Also take a look at [1]. I'm not asking to rebase on top of that change,
it need to be reviewed by other parties, but please keep it in mind.
[1]
https://lore.kernel.org/r/20241215-dpu-share-sspp-v5-1-665d26618...@linaro.org
> +
> + if (!pipe_cfg->valid)
> + break;
> +
> + pipe->sspp = dpu_rm_reserve_sspp(&dpu_kms->rm,
> global_state, crtc, &reqs);
> + if (!pipe->sspp)
> + return -ENODEV;
> +
> + /*
> + * If current pipe is the first pipe in pipe pair, check
> + * multi-rect opportunity for the 2nd pipe in the pair.
> + * SSPP multi-rect mode cross mixer pairs is not
> supported.
> + */
> + if ((i % PIPES_PER_STAGE == 0) &&
> + r_pipe_cfg->valid &&
> + !dpu_plane_try_multirect_parallel(pipe, pipe_cfg,
> r_pipe, r_pipe_cfg,
> + pipe->sspp,
> +
> msm_framebuffer_format(plane_state->fb),
> +
> dpu_kms->catalog->caps->max_linewidth)) {
> + i++;
> + } else {
> + /* multirect is not possible, use two SSPP
> blocks */
> + pipe->multirect_index = DPU_SSPP_RECT_SOLO;
> + pipe->multirect_mode = DPU_SSPP_MULTIRECT_NONE;
> + DPU_DEBUG_PLANE(pdpu, "allocating sspp_%d for
> pipe %d.\n",
> + pipe->sspp->idx - SSPP_NONE, i);
> + }
> + }
> }
>
> return dpu_plane_atomic_check_sspp(plane, state, crtc_state);
>
> --
> 2.34.1
>
--
With best wishes
Dmitry
