[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <4b146012-d9e8-446b-ba71-700eae70ae60@quicinc.com>
Date: Tue, 29 Apr 2025 17:35:33 -0700
From: Jessica Zhang <quic_jesszhan@...cinc.com>
To: Dmitry Baryshkov <lumag@...nel.org>, Rob Clark <robdclark@...il.com>,
Abhinav Kumar <quic_abhinavk@...cinc.com>, Sean Paul <sean@...rly.run>,
Marijn Suijten <marijn.suijten@...ainline.org>,
David Airlie
<airlied@...il.com>, Simona Vetter <simona@...ll.ch>
CC: <linux-arm-msm@...r.kernel.org>, <dri-devel@...ts.freedesktop.org>,
<freedreno@...ts.freedesktop.org>, <linux-kernel@...r.kernel.org>,
"Neil
Armstrong" <neil.armstrong@...aro.org>
Subject: Re: [PATCH v3 6/8] drm/msm/dpu: allocate single CTL for DPU >= 5.0
On 3/6/2025 10:24 PM, Dmitry Baryshkov wrote:
> From: Dmitry Baryshkov <dmitry.baryshkov@...aro.org>
>
> Unlike previous generation, since DPU 5.0 it is possible to use just one
> CTL to handle all INTF and WB blocks for a single output. And one has to
> use single CTL to support bonded DSI config. Allocate single CTL for
> these DPU versions.
>
> Reviewed-by: Marijn Suijten <marijn.suijten@...ainline.org>
> Tested-by: Neil Armstrong <neil.armstrong@...aro.org> # on SM8550-QRD
> Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@...aro.org>
Reviewed-by: Jessica Zhang <quic_jesszhan@...cinc.com>
> ---
> drivers/gpu/drm/msm/disp/dpu1/dpu_rm.c | 28 +++++++++++++++-------------
> drivers/gpu/drm/msm/disp/dpu1/dpu_rm.h | 2 ++
> 2 files changed, 17 insertions(+), 13 deletions(-)
>
> diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_rm.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_rm.c
> index 3efbba425ca6e037cb9646981ebb0f0354ffea8e..c72b968d58a65960605456e752278def2a21df7b 100644
> --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_rm.c
> +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_rm.c
> @@ -53,6 +53,8 @@ int dpu_rm_init(struct drm_device *dev,
> /* Clear, setup lists */
> memset(rm, 0, sizeof(*rm));
>
> + rm->has_legacy_ctls = (cat->mdss_ver->core_major_ver < 5);
> +
> /* Interrogate HW catalog and create tracking items for hw blocks */
> for (i = 0; i < cat->mixer_count; i++) {
> struct dpu_hw_mixer *hw;
> @@ -434,20 +436,19 @@ static int _dpu_rm_reserve_ctls(
> int i = 0, j, num_ctls;
> bool needs_split_display;
>
> - /*
> - * For non-CWB mode, each hw_intf needs its own hw_ctl to program its
> - * control path.
> - *
> - * Hardcode num_ctls to 1 if CWB is enabled because in CWB, both the
> - * writeback and real-time encoders must be driven by the same control
> - * path
> - */
> - if (top->cwb_enabled)
> - num_ctls = 1;
> - else
> + if (rm->has_legacy_ctls) {
> + /*
> + * TODO: check if there is a need for special handling if
> + * DPU < 5.0 get CWB support.
> + */
Regarding this note: there will need to be special handling for CWB for
DPU < 5.0 since one CTL will be driving both the WB and real-time encoders.
That being said, the current driver only supports CWB for DPU 10.x+, so
I'm also OK if the special handling is added whenever CWB for DPU < 5.0
is added.
Thanks,
Jessica Zhang
> num_ctls = top->num_intf;
>
> - needs_split_display = _dpu_rm_needs_split_display(top);
> + needs_split_display = _dpu_rm_needs_split_display(top);
> + } else {
> + /* use single CTL */
> + num_ctls = 1;
> + needs_split_display = false;
> + }
>
> for (j = 0; j < ARRAY_SIZE(rm->ctl_blks); j++) {
> const struct dpu_hw_ctl *ctl;
> @@ -465,7 +466,8 @@ static int _dpu_rm_reserve_ctls(
>
> DPU_DEBUG("ctl %d caps 0x%lX\n", j + CTL_0, features);
>
> - if (needs_split_display != has_split_display)
> + if (rm->has_legacy_ctls &&
> + needs_split_display != has_split_display)
> continue;
>
> ctl_idx[i] = j;
> diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_rm.h b/drivers/gpu/drm/msm/disp/dpu1/dpu_rm.h
> index a19dbdb1b6f48ad708f0d512c2460d092856f52f..aa62966056d489d9c94c61f24051a2f3e7b7ed89 100644
> --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_rm.h
> +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_rm.h
> @@ -24,6 +24,7 @@ struct dpu_global_state;
> * @dspp_blks: array of dspp hardware resources
> * @hw_sspp: array of sspp hardware resources
> * @cdm_blk: cdm hardware resource
> + * @has_legacy_ctls: DPU uses pre-ACTIVE CTL blocks.
> */
> struct dpu_rm {
> struct dpu_hw_blk *pingpong_blks[PINGPONG_MAX - PINGPONG_0];
> @@ -37,6 +38,7 @@ struct dpu_rm {
> struct dpu_hw_blk *dsc_blks[DSC_MAX - DSC_0];
> struct dpu_hw_sspp *hw_sspp[SSPP_MAX - SSPP_NONE];
> struct dpu_hw_blk *cdm_blk;
> + bool has_legacy_ctls;
> };
>
> struct dpu_rm_sspp_requirements {
>
Powered by blists - more mailing lists