From: abhinavk@codeaurora.org
To: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
Cc: Bjorn Andersson <bjorn.andersson@linaro.org>,
Rob Clark <robdclark@gmail.com>, Sean Paul <sean@poorly.run>,
Jonathan Marek <jonathan@marek.ca>,
Stephen Boyd <sboyd@kernel.org>, David Airlie <airlied@linux.ie>,
Daniel Vetter <daniel@ffwll.ch>,
linux-arm-msm@vger.kernel.org, dri-devel@lists.freedesktop.org,
freedreno@lists.freedesktop.org
Subject: Re: [Freedreno] [PATCH 05/11] drm/msm/dpu: move dpu_hw_pipe_cfg out of struct dpu_plane
Date: Thu, 21 Oct 2021 15:35:57 -0700 [thread overview]
Message-ID: <25f95f7fa81c2b9d771f6e3f26dc2820@codeaurora.org> (raw)
In-Reply-To: <20210930140002.308628-6-dmitry.baryshkov@linaro.org>
On 2021-09-30 06:59, Dmitry Baryshkov wrote:
> struct dpu_hw_pipe_cfg represents an interim state during atomic
> update/color fill, so move it out of struct dpu_plane.
>
> Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
Reviewed-by: Abhinav Kumar <abhinavk@codeaurora.org>
> ---
> drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c | 104 ++++++++++++----------
> 1 file changed, 57 insertions(+), 47 deletions(-)
>
> diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c
> b/drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c
> index ef3737642b0c..5288b5b824f8 100644
> --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c
> +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c
> @@ -104,7 +104,6 @@ struct dpu_plane {
> uint32_t features; /* capabilities from catalog */
>
> struct dpu_hw_pipe *pipe_hw;
> - struct dpu_hw_pipe_cfg pipe_cfg;
> uint32_t color_fill;
> bool is_error;
> bool is_rt_pipe;
> @@ -143,14 +142,15 @@ static struct dpu_kms *_dpu_plane_get_kms(struct
> drm_plane *plane)
> * _dpu_plane_calc_bw - calculate bandwidth required for a plane
> * @plane: Pointer to drm plane.
> * @fb: Pointer to framebuffer associated with the given plane
> + * @pipe_cfg: Pointer to pipe configuration
> * Result: Updates calculated bandwidth in the plane state.
> * BW Equation: src_w * src_h * bpp * fps * (v_total / v_dest)
> * Prefill BW Equation: line src bytes * line_time
> */
> static void _dpu_plane_calc_bw(struct drm_plane *plane,
> - struct drm_framebuffer *fb)
> + struct drm_framebuffer *fb,
> + struct dpu_hw_pipe_cfg *pipe_cfg)
> {
> - struct dpu_plane *pdpu = to_dpu_plane(plane);
> struct dpu_plane_state *pstate;
> struct drm_display_mode *mode;
> const struct dpu_format *fmt = NULL;
> @@ -167,9 +167,9 @@ static void _dpu_plane_calc_bw(struct drm_plane
> *plane,
>
> fmt = dpu_get_dpu_format_ext(fb->format->format, fb->modifier);
>
> - src_width = drm_rect_width(&pdpu->pipe_cfg.src_rect);
> - src_height = drm_rect_height(&pdpu->pipe_cfg.src_rect);
> - dst_height = drm_rect_height(&pdpu->pipe_cfg.dst_rect);
> + src_width = drm_rect_width(&pipe_cfg->src_rect);
> + src_height = drm_rect_height(&pipe_cfg->src_rect);
> + dst_height = drm_rect_height(&pipe_cfg->dst_rect);
> fps = drm_mode_vrefresh(mode);
> vbp = mode->vtotal - mode->vsync_end;
> vpw = mode->vsync_end - mode->vsync_start;
> @@ -200,12 +200,12 @@ static void _dpu_plane_calc_bw(struct drm_plane
> *plane,
> /**
> * _dpu_plane_calc_clk - calculate clock required for a plane
> * @plane: Pointer to drm plane.
> + * @pipe_cfg: Pointer to pipe configuration
> * Result: Updates calculated clock in the plane state.
> * Clock equation: dst_w * v_total * fps * (src_h / dst_h)
> */
> -static void _dpu_plane_calc_clk(struct drm_plane *plane)
> +static void _dpu_plane_calc_clk(struct drm_plane *plane, struct
> dpu_hw_pipe_cfg *pipe_cfg)
> {
> - struct dpu_plane *pdpu = to_dpu_plane(plane);
> struct dpu_plane_state *pstate;
> struct drm_display_mode *mode;
> int dst_width, src_height, dst_height, fps;
> @@ -213,9 +213,9 @@ static void _dpu_plane_calc_clk(struct drm_plane
> *plane)
> pstate = to_dpu_plane_state(plane->state);
> mode = &plane->state->crtc->mode;
>
> - src_height = drm_rect_height(&pdpu->pipe_cfg.src_rect);
> - dst_width = drm_rect_width(&pdpu->pipe_cfg.dst_rect);
> - dst_height = drm_rect_height(&pdpu->pipe_cfg.dst_rect);
> + src_height = drm_rect_height(&pipe_cfg->src_rect);
> + dst_width = drm_rect_width(&pipe_cfg->dst_rect);
> + dst_height = drm_rect_height(&pipe_cfg->dst_rect);
> fps = drm_mode_vrefresh(mode);
>
> pstate->plane_clk =
> @@ -252,14 +252,17 @@ static int _dpu_plane_calc_fill_level(struct
> drm_plane *plane,
> fixed_buff_size = pdpu->catalog->caps->pixel_ram_size;
>
> list_for_each_entry(tmp, &pdpu->mplane_list, mplane_list) {
> + u32 tmp_width;
> +
> if (!tmp->base.state->visible)
> continue;
> + tmp_width = drm_rect_width(&tmp->base.state->src) >> 16;
> DPU_DEBUG("plane%d/%d src_width:%d/%d\n",
> pdpu->base.base.id, tmp->base.base.id,
> src_width,
> - drm_rect_width(&tmp->pipe_cfg.src_rect));
> + tmp_width);
> src_width = max_t(u32, src_width,
> - drm_rect_width(&tmp->pipe_cfg.src_rect));
> + tmp_width);
> }
>
> if (fmt->fetch_planes == DPU_PLANE_PSEUDO_PLANAR) {
> @@ -319,9 +322,10 @@ static u64 _dpu_plane_get_qos_lut(const struct
> dpu_qos_lut_tbl *tbl,
> * _dpu_plane_set_qos_lut - set QoS LUT of the given plane
> * @plane: Pointer to drm plane
> * @fb: Pointer to framebuffer associated with the given plane
> + * @pipe_cfg: Pointer to pipe configuration
> */
> static void _dpu_plane_set_qos_lut(struct drm_plane *plane,
> - struct drm_framebuffer *fb)
> + struct drm_framebuffer *fb, struct dpu_hw_pipe_cfg *pipe_cfg)
> {
> struct dpu_plane *pdpu = to_dpu_plane(plane);
> const struct dpu_format *fmt = NULL;
> @@ -335,7 +339,7 @@ static void _dpu_plane_set_qos_lut(struct drm_plane
> *plane,
> fb->format->format,
> fb->modifier);
> total_fl = _dpu_plane_calc_fill_level(plane, fmt,
> - drm_rect_width(&pdpu->pipe_cfg.src_rect));
> + drm_rect_width(&pipe_cfg->src_rect));
>
> if (fmt && DPU_FORMAT_IS_LINEAR(fmt))
> lut_usage = DPU_QOS_LUT_USAGE_LINEAR;
> @@ -461,9 +465,10 @@ static void _dpu_plane_set_qos_ctrl(struct
> drm_plane *plane,
> * _dpu_plane_set_ot_limit - set OT limit for the given plane
> * @plane: Pointer to drm plane
> * @crtc: Pointer to drm crtc
> + * @pipe_cfg: Pointer to pipe configuration
> */
> static void _dpu_plane_set_ot_limit(struct drm_plane *plane,
> - struct drm_crtc *crtc)
> + struct drm_crtc *crtc, struct dpu_hw_pipe_cfg *pipe_cfg)
> {
> struct dpu_plane *pdpu = to_dpu_plane(plane);
> struct dpu_vbif_set_ot_params ot_params;
> @@ -472,8 +477,8 @@ static void _dpu_plane_set_ot_limit(struct
> drm_plane *plane,
> memset(&ot_params, 0, sizeof(ot_params));
> ot_params.xin_id = pdpu->pipe_hw->cap->xin_id;
> ot_params.num = pdpu->pipe_hw->idx - SSPP_NONE;
> - ot_params.width = drm_rect_width(&pdpu->pipe_cfg.src_rect);
> - ot_params.height = drm_rect_height(&pdpu->pipe_cfg.src_rect);
> + ot_params.width = drm_rect_width(&pipe_cfg->src_rect);
> + ot_params.height = drm_rect_height(&pipe_cfg->src_rect);
> ot_params.is_wfd = !pdpu->is_rt_pipe;
> ot_params.frame_rate = drm_mode_vrefresh(&crtc->mode);
> ot_params.vbif_idx = VBIF_RT;
> @@ -651,17 +656,18 @@ static void _dpu_plane_setup_csc(struct dpu_plane
> *pdpu)
>
> static void _dpu_plane_setup_scaler(struct dpu_plane *pdpu,
> struct dpu_plane_state *pstate,
> - const struct dpu_format *fmt, bool color_fill)
> + const struct dpu_format *fmt, bool color_fill,
> + struct dpu_hw_pipe_cfg *pipe_cfg)
> {
> const struct drm_format_info *info =
> drm_format_info(fmt->base.pixel_format);
>
> /* don't chroma subsample if decimating */
> /* update scaler. calculate default config for QSEED3 */
> _dpu_plane_setup_scaler3(pdpu, pstate,
> - drm_rect_width(&pdpu->pipe_cfg.src_rect),
> - drm_rect_height(&pdpu->pipe_cfg.src_rect),
> - drm_rect_width(&pdpu->pipe_cfg.dst_rect),
> - drm_rect_height(&pdpu->pipe_cfg.dst_rect),
> + drm_rect_width(&pipe_cfg->src_rect),
> + drm_rect_height(&pipe_cfg->src_rect),
> + drm_rect_width(&pipe_cfg->dst_rect),
> + drm_rect_height(&pipe_cfg->dst_rect),
> &pstate->scaler3_cfg, fmt,
> info->hsub, info->vsub);
> }
> @@ -679,6 +685,7 @@ static int _dpu_plane_color_fill(struct dpu_plane
> *pdpu,
> const struct dpu_format *fmt;
> const struct drm_plane *plane = &pdpu->base;
> struct dpu_plane_state *pstate = to_dpu_plane_state(plane->state);
> + struct dpu_hw_pipe_cfg pipe_cfg;
>
> DPU_DEBUG_PLANE(pdpu, "\n");
>
> @@ -695,13 +702,15 @@ static int _dpu_plane_color_fill(struct dpu_plane
> *pdpu,
> pstate->multirect_index);
>
> /* override scaler/decimation if solid fill */
> - pdpu->pipe_cfg.src_rect.x1 = 0;
> - pdpu->pipe_cfg.src_rect.y1 = 0;
> - pdpu->pipe_cfg.src_rect.x2 =
> - drm_rect_width(&pdpu->pipe_cfg.dst_rect);
> - pdpu->pipe_cfg.src_rect.y2 =
> - drm_rect_height(&pdpu->pipe_cfg.dst_rect);
> - _dpu_plane_setup_scaler(pdpu, pstate, fmt, true);
> + pipe_cfg.dst_rect = pstate->base.dst;
> +
> + pipe_cfg.src_rect.x1 = 0;
> + pipe_cfg.src_rect.y1 = 0;
> + pipe_cfg.src_rect.x2 =
> + drm_rect_width(&pipe_cfg.dst_rect);
> + pipe_cfg.src_rect.y2 =
> + drm_rect_height(&pipe_cfg.dst_rect);
> + _dpu_plane_setup_scaler(pdpu, pstate, fmt, true, &pipe_cfg);
>
> if (pdpu->pipe_hw->ops.setup_format)
> pdpu->pipe_hw->ops.setup_format(pdpu->pipe_hw,
> @@ -710,7 +719,7 @@ static int _dpu_plane_color_fill(struct dpu_plane
> *pdpu,
>
> if (pdpu->pipe_hw->ops.setup_rects)
> pdpu->pipe_hw->ops.setup_rects(pdpu->pipe_hw,
> - &pdpu->pipe_cfg,
> + &pipe_cfg,
> pstate->multirect_index);
>
> if (pdpu->pipe_hw->ops.setup_pe)
> @@ -720,7 +729,7 @@ static int _dpu_plane_color_fill(struct dpu_plane
> *pdpu,
> if (pdpu->pipe_hw->ops.setup_scaler &&
> pstate->multirect_index != DPU_SSPP_RECT_1)
> pdpu->pipe_hw->ops.setup_scaler(pdpu->pipe_hw,
> - &pdpu->pipe_cfg, &pstate->pixel_ext,
> + &pipe_cfg, &pstate->pixel_ext,
> &pstate->scaler3_cfg);
> }
>
> @@ -1087,10 +1096,11 @@ static void
> dpu_plane_sspp_atomic_update(struct drm_plane *plane)
> bool is_rt_pipe, update_qos_remap;
> const struct dpu_format *fmt =
> to_dpu_format(msm_framebuffer_format(fb));
> + struct dpu_hw_pipe_cfg pipe_cfg;
>
> - memset(&(pdpu->pipe_cfg), 0, sizeof(struct dpu_hw_pipe_cfg));
> + memset(&pipe_cfg, 0, sizeof(struct dpu_hw_pipe_cfg));
>
> - _dpu_plane_set_scanout(plane, pstate, &pdpu->pipe_cfg, fb);
> + _dpu_plane_set_scanout(plane, pstate, &pipe_cfg, fb);
>
> pstate->pending = true;
>
> @@ -1102,17 +1112,17 @@ static void
> dpu_plane_sspp_atomic_update(struct drm_plane *plane)
> crtc->base.id, DRM_RECT_ARG(&state->dst),
> (char *)&fmt->base.pixel_format, DPU_FORMAT_IS_UBWC(fmt));
>
> - pdpu->pipe_cfg.src_rect = state->src;
> + pipe_cfg.src_rect = state->src;
>
> /* state->src is 16.16, src_rect is not */
> - pdpu->pipe_cfg.src_rect.x1 >>= 16;
> - pdpu->pipe_cfg.src_rect.x2 >>= 16;
> - pdpu->pipe_cfg.src_rect.y1 >>= 16;
> - pdpu->pipe_cfg.src_rect.y2 >>= 16;
> + pipe_cfg.src_rect.x1 >>= 16;
> + pipe_cfg.src_rect.x2 >>= 16;
> + pipe_cfg.src_rect.y1 >>= 16;
> + pipe_cfg.src_rect.y2 >>= 16;
>
> - pdpu->pipe_cfg.dst_rect = state->dst;
> + pipe_cfg.dst_rect = state->dst;
>
> - _dpu_plane_setup_scaler(pdpu, pstate, fmt, false);
> + _dpu_plane_setup_scaler(pdpu, pstate, fmt, false, &pipe_cfg);
>
> /* override for color fill */
> if (pdpu->color_fill & DPU_PLANE_COLOR_FILL_FLAG) {
> @@ -1122,7 +1132,7 @@ static void dpu_plane_sspp_atomic_update(struct
> drm_plane *plane)
>
> if (pdpu->pipe_hw->ops.setup_rects) {
> pdpu->pipe_hw->ops.setup_rects(pdpu->pipe_hw,
> - &pdpu->pipe_cfg,
> + &pipe_cfg,
> pstate->multirect_index);
> }
>
> @@ -1139,7 +1149,7 @@ static void dpu_plane_sspp_atomic_update(struct
> drm_plane *plane)
> if (pdpu->pipe_hw->ops.setup_scaler &&
> pstate->multirect_index != DPU_SSPP_RECT_1)
> pdpu->pipe_hw->ops.setup_scaler(pdpu->pipe_hw,
> - &pdpu->pipe_cfg, &pstate->pixel_ext,
> + &pipe_cfg, &pstate->pixel_ext,
> &pstate->scaler3_cfg);
>
> if (pdpu->pipe_hw->ops.setup_multirect)
> @@ -1192,12 +1202,12 @@ static void
> dpu_plane_sspp_atomic_update(struct drm_plane *plane)
> pdpu->csc_ptr = 0;
> }
>
> - _dpu_plane_set_qos_lut(plane, fb);
> + _dpu_plane_set_qos_lut(plane, fb, &pipe_cfg);
> _dpu_plane_set_danger_lut(plane, fb);
>
> if (plane->type != DRM_PLANE_TYPE_CURSOR) {
> _dpu_plane_set_qos_ctrl(plane, true, DPU_PLANE_QOS_PANIC_CTRL);
> - _dpu_plane_set_ot_limit(plane, crtc);
> + _dpu_plane_set_ot_limit(plane, crtc, &pipe_cfg);
> }
>
> update_qos_remap = (is_rt_pipe != pdpu->is_rt_pipe) ||
> @@ -1211,9 +1221,9 @@ static void dpu_plane_sspp_atomic_update(struct
> drm_plane *plane)
> _dpu_plane_set_qos_remap(plane);
> }
>
> - _dpu_plane_calc_bw(plane, fb);
> + _dpu_plane_calc_bw(plane, fb, &pipe_cfg);
>
> - _dpu_plane_calc_clk(plane);
> + _dpu_plane_calc_clk(plane, &pipe_cfg);
> }
>
> static void _dpu_plane_atomic_disable(struct drm_plane *plane)
next prev parent reply other threads:[~2021-10-21 22:36 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-09-30 13:59 [PATCH 00/11] drm/msm/dpu: cleanup plane state Dmitry Baryshkov
2021-09-30 13:59 ` [PATCH 01/11] drm/msm/dpu: move LUT levels out of QOS config Dmitry Baryshkov
2021-10-21 22:22 ` [Freedreno] " abhinavk
2021-09-30 13:59 ` [PATCH 02/11] drm/msm/dpu: remove pipe_qos_cfg from struct dpu_plane Dmitry Baryshkov
2021-10-21 22:24 ` [Freedreno] " abhinavk
2021-09-30 13:59 ` [PATCH 03/11] drm/msm/dpu: drop pipe_name " Dmitry Baryshkov
2021-10-21 22:25 ` [Freedreno] " abhinavk
2021-09-30 13:59 ` [PATCH 04/11] drm/msm/dpu: remove stage_cfg from struct dpu_crtc Dmitry Baryshkov
2021-10-21 22:30 ` [Freedreno] " abhinavk
2021-09-30 13:59 ` [PATCH 05/11] drm/msm/dpu: move dpu_hw_pipe_cfg out of struct dpu_plane Dmitry Baryshkov
2021-10-21 22:35 ` abhinavk [this message]
2021-09-30 13:59 ` [PATCH 06/11] drm/msm/dpu: drop scaler config from plane state Dmitry Baryshkov
2021-10-21 22:41 ` [Freedreno] " abhinavk
2021-09-30 13:59 ` [PATCH 07/11] drm/msm/dpu: drop dpu_csc_cfg from dpu_plane Dmitry Baryshkov
2021-10-21 23:17 ` [Freedreno] " abhinavk
2021-09-30 13:59 ` [PATCH 08/11] drm/msm/dpu: remove dpu_hw_pipe_cdp_cfg " Dmitry Baryshkov
2021-10-21 23:19 ` [Freedreno] " abhinavk
2021-09-30 14:00 ` [PATCH 09/11] drm/msm/dpu: don't cache pipe->cap->features in dpu_plane Dmitry Baryshkov
2021-10-21 23:24 ` [Freedreno] " abhinavk
2021-09-30 14:00 ` [PATCH 10/11] drm/msm/dpu: don't cache pipe->cap->sblk " Dmitry Baryshkov
2021-10-21 23:29 ` [Freedreno] " abhinavk
2021-09-30 14:00 ` [PATCH 11/11] drm/msm/dpu: rip out debugfs support from dpu_plane Dmitry Baryshkov
2021-10-21 23:53 ` [Freedreno] " abhinavk
2021-10-22 11:35 ` Dmitry Baryshkov
2021-11-18 21:43 ` Rob Clark
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=25f95f7fa81c2b9d771f6e3f26dc2820@codeaurora.org \
--to=abhinavk@codeaurora.org \
--cc=airlied@linux.ie \
--cc=bjorn.andersson@linaro.org \
--cc=daniel@ffwll.ch \
--cc=dmitry.baryshkov@linaro.org \
--cc=dri-devel@lists.freedesktop.org \
--cc=freedreno@lists.freedesktop.org \
--cc=jonathan@marek.ca \
--cc=linux-arm-msm@vger.kernel.org \
--cc=robdclark@gmail.com \
--cc=sboyd@kernel.org \
--cc=sean@poorly.run \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).